diff --git a/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF
index 4ba92b00..a2ca46bc 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.incquery.tooling.ui/META-INF/MANIFEST.MF
@@ -42,14 +42,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.codegen.ecore,
  org.eclipse.incquery.tooling.generator.model;bundle-version="0.6.0",
  org.eclipse.incquery.tooling.core;bundle-version="0.6.0"
-Bundle-Activator: org.eclipse.incquery.ui.IncQueryGUIPlugin
+Bundle-Activator: org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.incquery.ui.dialog,
- org.eclipse.incquery.ui.queryexplorer,
- org.eclipse.incquery.ui.queryexplorer.adapters,
- org.eclipse.incquery.ui.queryexplorer.content.matcher,
- org.eclipse.incquery.ui.queryexplorer.content.patternsviewer,
- org.eclipse.incquery.ui.queryexplorer.handlers,
- org.eclipse.incquery.ui.queryexplorer.handlers.util,
- org.eclipse.incquery.ui.queryexplorer.util
+Export-Package: org.eclipse.incquery.tooling.ui.dialog,
+ org.eclipse.incquery.tooling.ui.queryexplorer,
+ org.eclipse.incquery.tooling.ui.queryexplorer.adapters,
+ org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher,
+ org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer,
+ org.eclipse.incquery.tooling.ui.queryexplorer.handlers,
+ org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util,
+ org.eclipse.incquery.tooling.ui.queryexplorer.util
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml
index 60af8fca..8b4d159d 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml
+++ b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/newproject.xml
@@ -29,7 +29,7 @@ To create the example EMF metamodel, you may either import the domain project (<
       <subitem label="Issue: File | New | Project | EMF-IncQuery | EMF-IncQuery Project">
          <command
                required="false"
-               serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.newproject)"/>
+               serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.newproject)"/>
       </subitem>
       <subitem label="Give a name to the project (e.g. school.incquery), then press Finish."></subitem>
       <!-- <subitem skip="true" label="(Optionally, only if you aren't using a new Eclipse Application:) On the second wizard page, add a reference to the school.genmodel Generator Model by pushing Add and browsing to the school.genmodel file in the school project. Click on Finish to proceed."></subitem> -->
diff --git a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml
index 30ab283a..16fdaa84 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml
+++ b/plugins/org.eclipse.incquery.tooling.ui/cheatsheets/queries.xml
@@ -14,7 +14,7 @@
    			Note: if you wish to specify queries for a domain defined in a project that is already installed as a plug-in (in EMF terms, registered in the Global EPackage Registry), the .eiqgen file is not necessary.
    		</description>
    		<subitem label="Issue: File | New | Other | EMF-IncQuery | EMF-IncQuery Generator Model">
-         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.neweiqgenmodel)"/>
+         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.neweiqgenmodel)"/>
       	</subitem>
       	<subitem skip="false" label="Select the target EMF-IncQuery project to which a new Generator Model will be added."></subitem>
       	<subitem skip="false" label="Specify EMF .genmodels from your workspace using the Add button."></subitem>
@@ -28,7 +28,7 @@
       	Query definition patterns can have <b>header parameters</b> that specify the input/output variables of a query. Each header parameter should have a type assigned, and it can serves both as input and output depending on the <b>parameter binding</b>. Parameter bindings may be later provided using the Details/Filters panel (right side) in the Query Explorer, or using the Java API. A binding may specify that a header parameter should correspond to a pre-determined value, e.g. a model object or a scalar value.<br/>
       </description>
       <subitem label="Issue: File | New | Other | EMF-IncQuery | EMF-IncQuery Query Definition">
-         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.viatra2.emf.incquery.gui.neweiqfile)"/>
+         <command required="false" serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.incquery.tooling.ui.neweiqfile)"/>
       </subitem>
       <subitem skip="true" label="On the second wizard page, give your pattern a unique name."></subitem>
       <subitem skip="true" label="Specify packages to import."></subitem>
@@ -60,7 +60,7 @@ This pattern includes a simple <b>edge type constraint</b> of type School.teache
 Make sure that you are experimenting with the Query Explorer in the same Eclipse instance where the school.incquery project is located (and which already contains school, school.edit and school.editor as plug-ins).
    	</description>
    	<subitem skip="true" label="Open the Query Explorer view, if not already open.">
-   		<command required="true" serialization="org.eclipse.ui.views.showView(org.eclipse.viatra2.emf.incquery.queryexplorer.QueryExplorer)"></command>
+   		<command required="true" serialization="org.eclipse.ui.views.showView(org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer)"></command>
    	</subitem>
    	<subitem skip="false" label="Import your query definition patterns by putting the Query Definition Editor in focus, and then pushing the green button in the top right corner of the Query Explorer."></subitem>
    	<subitem skip="false" label="Apply the query patterns on an instance model, by opening an instance model in the School Editor, and then pushing the green button again."></subitem>
diff --git a/plugins/org.eclipse.incquery.tooling.ui/plugin.xml b/plugins/org.eclipse.incquery.tooling.ui/plugin.xml
index b0f5ffe2..57c952e3 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/plugin.xml
+++ b/plugins/org.eclipse.incquery.tooling.ui/plugin.xml
@@ -4,33 +4,33 @@
    <extension
          point="org.eclipse.ui.newWizards">
       <category
-            id="org.eclipse.incquery.ui.category"
+            id="org.eclipse.incquery.tooling.ui.category"
             name="EMF-IncQuery">
       </category>
       <wizard
-            category="org.eclipse.incquery.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse..incquery.ui.wizards.NewProjectWizard"
+            category="org.eclipse.incquery.tooling.ui.category"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.wizards.NewProjectWizard"
             finalPerspective="org.eclipse.pde.ui.PDEPerspective"
             icon="icons/logo2.png"
-            id="org.eclipse..incquery.ui.newproject"
+            id="org.eclipse.incquery.tooling.ui.newproject"
             name="EMF-IncQuery Project"
             preferredPerspectives="org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective"
             project="true">
       </wizard>
       <wizard
             category="org.eclipse.incquery.tooling.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse..incquery.ui.wizards.NewEiqFileWizard"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.uiwizards.NewEiqFileWizard"
             finalPerspective="org.eclipse.pde.ui.PDEPerspective"
             icon="icons/logo2.png"
-            id="org.eclipse.incquery.ui.neweiqfile"
+            id="org.eclipse.incquery.tooling.ui.neweiqfile"
             name="EMF-IncQuery Query Definition "
             preferredPerspectives="org.eclipse.pde.ui.PDEPerspective,org.eclipse.jdt.ui.JavaPerspective">
       </wizard>
       <wizard
             category="org.eclipse.incquery.tooling.ui.category"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.wizards.NewGenmodelWizard"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.wizards.NewGenmodelWizard"
             icon="icons/logo2.png"
-            id="org.eclipse.incquery.ui.neweiqgenmodel"
+            id="org.eclipse.incquery.tooling.ui.neweiqgenmodel"
             name="EMF-IncQuery Generator Model"
             project="false">
       </wizard>
@@ -45,7 +45,7 @@
             category="org.eclipse.incquery"
             composite="true"
             contentFile="cheatsheets/gettingstarted.xml"
-            id="org.eclipse.incquery.ui.cheatsheet"
+            id="org.eclipse.incquery.tooling.ui.cheatsheet"
             name="Getting Started with EMF-IncQuery">
       </cheatsheet>
    </extension>
@@ -57,7 +57,7 @@
       </category>
       <view
             category="org.eclipse.incquery.tooling.ui"
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
             icon="icons/logo2.png"
             id="org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer"
             name="Query Explorer">
@@ -166,7 +166,7 @@
             <iterate
                   ifEmpty="false">
                <instanceof
-                     value="org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComponent">
+                     value="org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComponent">
                </instanceof>
             </iterate>
             <count
@@ -196,11 +196,11 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.RuntimeMatcherRegistrationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.RuntimeMatcherRegistrationHandler"
             commandId="org.eclipse.incquery.tooling.ui.runtimematcherreg">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadmodel">
          <activeWhen>
             <reference
@@ -209,7 +209,7 @@
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqPatternHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqPatternHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadmodel">
          <activeWhen>
             <reference
@@ -218,47 +218,47 @@
          </activeWhen>
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.ShowLocationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.ShowLocationHandler"
             commandId="org.eclipse.incquery.tooling.ui.showlocation">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.UnloadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.UnloadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.unmodel">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PatternUnregistrationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PatternUnregistrationHandler"
             commandId="org.eclipse.incquery.tooling.ui.unregisterpattern">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PackagePresentationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PackagePresentationHandler"
             commandId="org.eclipse.incquery.tooling.ui.pattern.flat">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.PackagePresentationHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PackagePresentationHandler"
             commandId="org.eclipse.incquery.tooling.ui.pattern.hierarchical">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadresourceset">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadResourceHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadResourceHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadresource">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqModelHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqModelHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadeiqmodel">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.LoadEiqPatternHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.LoadEiqPatternHandler"
             commandId="org.eclipse.incquery.tooling.ui.loadeiqpattern">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.ui.queryexplorer.handlers.PatternRegitryShowLocationHandler"
+            class="org.eclipse.incquery.tooling.ui.IncQueryLanguageExecutableExtensionFactory:org.eclipse.incquery.tooling.ui.queryexplorer.handlers.PatternRegitryShowLocationHandler"
             commandId="org.eclipse.incquery.tooling.ui.showlocation_patternreg">
       </handler>
       <handler
-            class="org.eclipse.incquery.ui.queryexplorer.handlers.ResetUIHandler"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.handlers.ResetUIHandler"
             commandId="org.eclipse.incquery.tooling.ui.resetui">
       </handler>
    </extension>
@@ -288,7 +288,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="toolbar:org.eclipse.incquery.ui.queryexplorer.QueryExplorer">
+            locationURI="toolbar:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer">
          <command
                commandId="org.eclipse.incquery.tooling.ui.loadmodel"
                icon="icons/load.gif"
@@ -303,7 +303,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.incquery.ui.queryexplorer.QueryExplorer.treeViewerMenu">
+            locationURI="popup:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer.treeViewerMenu">
          <command
                commandId="org.eclipse.incquery.tooling.ui.showlocation"
                icon="icons/forward_nav.gif"
@@ -357,7 +357,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.incquery.ui.queryexplorer.QueryExplorer.patternsViewerMenu">
+            locationURI="popup:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer.patternsViewerMenu">
          <command
                commandId="org.eclipse.incquery.tooling.ui.unregisterpattern"
                icon="icons/unload.gif"
@@ -373,7 +373,7 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="menu:org.eclipse.incquery.ui.queryexplorer.QueryExplorer">
+            locationURI="menu:org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer">
          <menu
                label="Patterns viewer presentation">
             <command
@@ -514,7 +514,7 @@
          point="org.eclipse.ui.navigator.navigatorContent">
       <commonFilter
             activeByDefault="true"
-            class="org.eclipse.incquery.ui.content.QueryFolderFilter"
+            class="org.eclipse.incquery.tooling.ui.content.QueryFolderFilter"
             description="Hides EMF-IncQuery queries folder"
             id="org.eclipse.incquery.tooling.ui.queriesFolderFilter"
             name="EMF-IncQuery output folder"
@@ -535,7 +535,7 @@
    <extension
          point="org.eclipse.jdt.ui.javaElementFilters">
       <filter
-            class="org.eclipse.incquery.ui.content.QueryFolderFilter"
+            class="org.eclipse.incquery.tooling.ui.content.QueryFolderFilter"
             description="Hides EMF-IncQuery queries folder"
             enabled="true"
             id="org.eclipse.incquery.tooling.ui.queriesFolderFilter"
@@ -545,7 +545,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.incquery.patternlanguage.emf.EMFPatternLanguage"
-            class="org.eclipse.incquery.ui.queryexplorer.preference.PatternInitializationPreferencePage"
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.preference.PatternInitializationPreferencePage"
             id="org.eclipse.incquery.tooling.ui.page1"
             name="Query Explorer">
          <keywordReference
@@ -596,7 +596,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="org.eclipse.emf.edit.domain.IEditingDomainProvider"
-            class="org.eclipse.incquery.ui.queryexplorer.adapters.AdapterFactoryForEcoreEditors">
+            class="org.eclipse.incquery.tooling.ui.queryexplorer.adapters.AdapterFactoryForEcoreEditors">
          <adapter
                type="org.eclipse.emf.ecore.resource.ResourceSet">
          </adapter>
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryGUIPlugin.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryGUIPlugin.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryGUIPlugin.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryGUIPlugin.java
index f3f975a9..26cb4019 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryGUIPlugin.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryGUIPlugin.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui;
+package org.eclipse.incquery.tooling.ui;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryLanguageExecutableExtensionFactory.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryLanguageExecutableExtensionFactory.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryLanguageExecutableExtensionFactory.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryLanguageExecutableExtensionFactory.java
index 891f0101..5b7436ab 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/IncQueryLanguageExecutableExtensionFactory.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/IncQueryLanguageExecutableExtensionFactory.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui;
+package org.eclipse.incquery.tooling.ui;
 
 import org.eclipse.incquery.patternlanguage.emf.ui.EMFPatternLanguageExecutableExtensionFactory;
 import org.osgi.framework.Bundle;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/content/QueryFolderFilter.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/content/QueryFolderFilter.java
similarity index 97%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/content/QueryFolderFilter.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/content/QueryFolderFilter.java
index 568000b6..82e2db7c 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/content/QueryFolderFilter.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/content/QueryFolderFilter.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.content;
+package org.eclipse.incquery.tooling.ui.content;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogContentProvider.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogContentProvider.java
index 265e85cf..ca1867f1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Mark Czotter - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.dialog;
+package org.eclipse.incquery.tooling.ui.dialog;
 
 import java.util.Collection;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogLabelProvider.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogLabelProvider.java
index fd5cf675..ff610ca1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/PatternMatchDialogLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/PatternMatchDialogLabelProvider.java
@@ -8,12 +8,12 @@
  * Contributors:
  *   Mark Czotter - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.dialog;
+package org.eclipse.incquery.tooling.ui.dialog;
 
 import org.eclipse.incquery.databinding.runtime.adapter.DatabindingAdapterUtil;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/SampleUIDialogCreator.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/SampleUIDialogCreator.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/SampleUIDialogCreator.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/SampleUIDialogCreator.java
index b7176c5b..88be666e 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/dialog/SampleUIDialogCreator.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/dialog/SampleUIDialogCreator.java
@@ -8,13 +8,13 @@
  * Contributors:
  *   Mark Czotter - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.dialog;
+package org.eclipse.incquery.tooling.ui.dialog;
 
 import java.util.Collection;
 
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/QueryExplorer.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/QueryExplorer.java
similarity index 86%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/QueryExplorer.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/QueryExplorer.java
index ad504054..74f8a289 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/QueryExplorer.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/QueryExplorer.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer;
+package org.eclipse.incquery.tooling.ui.queryexplorer;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,30 +23,30 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.content.detail.TableViewerUtil;
-import org.eclipse.incquery.ui.queryexplorer.content.flyout.FlyoutControlComposite;
-import org.eclipse.incquery.ui.queryexplorer.content.flyout.FlyoutPreferences;
-import org.eclipse.incquery.ui.queryexplorer.content.flyout.IFlyoutPreferences;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherContentProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComponent;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternsViewerFlatContentProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternsViewerFlatLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternsViewerHierarchicalContentProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternsViewerHierarchicalLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternsViewerInput;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.ModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.preference.PreferenceConstants;
-import org.eclipse.incquery.ui.queryexplorer.util.CheckStateListener;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
-import org.eclipse.incquery.ui.queryexplorer.util.DoubleClickListener;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
-import org.eclipse.incquery.ui.queryexplorer.util.ResourceChangeListener;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.detail.TableViewerUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout.FlyoutControlComposite;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout.FlyoutPreferences;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout.IFlyoutPreferences;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherContentProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherLabelProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatch;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComponent;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternsViewerFlatContentProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternsViewerFlatLabelProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternsViewerHierarchicalContentProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternsViewerHierarchicalLabelProvider;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternsViewerInput;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.ModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.preference.PreferenceConstants;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.CheckStateListener;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DoubleClickListener;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.ResourceChangeListener;
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -85,7 +85,7 @@ public class QueryExplorer extends ViewPart {
 	private static final String PATTERNS_VIEWER_FLYOUT_STATE = "patternsViewerFlyoutState";
 	private static final String DETAILS_VIEW_FLYOUT_STATE = "detailsViewFlyoutState";
 
-	public static final String ID = "org.eclipse.viatra2.emf.incquery.queryexplorer.QueryExplorer";
+    public static final String ID = "org.eclipse.incquery.queryexplorer.QueryExplorer";
 	
 	private final Map<MatcherTreeViewerRootKey, ModelConnector> modelConnectorMap = new HashMap<MatcherTreeViewerRootKey, ModelConnector>();
 	
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java
index 85d4ee90..9c664ddd 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterFactoryForEcoreEditors.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Andras Okros - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.adapters;
+package org.eclipse.incquery.tooling.ui.queryexplorer.adapters;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterUtil.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterUtil.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterUtil.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterUtil.java
index 830c22bf..49f86d2e 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/adapters/AdapterUtil.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/adapters/AdapterUtil.java
@@ -8,14 +8,14 @@
  * Contributors:
  *   Andras Okros - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.adapters;
+package org.eclipse.incquery.tooling.ui.queryexplorer.adapters;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.ui.IEditorPart;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailComparator.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailComparator.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailComparator.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailComparator.java
index 13752eff..b115a0d7 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailComparator.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailComparator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import java.util.Comparator;
 import java.util.HashMap;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElement.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElement.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElement.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElement.java
index e1c1ee14..5bb678f0 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElement.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElement.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 /**
  * This class represents a single row in the table viewer and is associated to a single 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementCellModifier.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementCellModifier.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementCellModifier.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementCellModifier.java
index adca64e9..9398c906 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementCellModifier.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementCellModifier.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.jface.viewers.ICellModifier;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementLabelProvider.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementLabelProvider.java
index 7ffe5966..b33c50c3 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailElementLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailElementLabelProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailObserver.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailObserver.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailObserver.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailObserver.java
index 860291fa..e678d23b 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/DetailObserver.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/DetailObserver.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,8 +27,8 @@
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.incquery.databinding.runtime.adapter.DatabindingAdapter;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatch;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 
 /**
  * The class is used to provide input for the tableviewer for a given PatternMatch.
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfiguration.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfiguration.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfiguration.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfiguration.java
index d665e959..bd20a97d 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfiguration.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfiguration.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 public class MatcherConfiguration {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java
index 77d95df0..074ea911 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationCellModifier.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.widgets.Item;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java
index 89781aba..5fcb2c72 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationContentProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java
index b6bc214f..cc3177c0 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/MatcherConfigurationLabelProvider.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementCellEditor.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementCellEditor.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementCellEditor.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementCellEditor.java
index b4c37716..32f2ec1b 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementCellEditor.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementCellEditor.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Tamas Szabo - extended functionality
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -20,7 +20,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java
index 76ff072e..582c34c5 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/ModelElementListDialogLabelProvider.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/TableViewerUtil.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/TableViewerUtil.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/TableViewerUtil.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/TableViewerUtil.java
index 3e278d46..e919f6dd 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/detail/TableViewerUtil.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/detail/TableViewerUtil.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.detail;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.detail;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -18,10 +18,10 @@
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Variable;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatch;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.TableViewer;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DockAction.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DockAction.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DockAction.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DockAction.java
index 31255c36..4f06538f 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DockAction.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DockAction.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 import org.eclipse.jface.action.Action;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DrawUtils.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DrawUtils.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DrawUtils.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DrawUtils.java
index 47f8c8e1..9e174c77 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/DrawUtils.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/DrawUtils.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutConstants.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutConstants.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutConstants.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutConstants.java
index 7debf9aa..b5397660 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutConstants.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutConstants.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutContainer.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutContainer.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutContainer.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutContainer.java
index 4ea04865..75a1d0a5 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutContainer.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutContainer.java
@@ -9,9 +9,9 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutControlComposite.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutControlComposite.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutControlComposite.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutControlComposite.java
index 7b2b5b21..1922ba42 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutControlComposite.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutControlComposite.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Rectangle;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutPreferences.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutPreferences.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutPreferences.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutPreferences.java
index 31e7c104..6468346f 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/FlyoutPreferences.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/FlyoutPreferences.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 public final class FlyoutPreferences implements IFlyoutPreferences {
 	private int dockLocation;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/ICursorConstants.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/ICursorConstants.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/ICursorConstants.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/ICursorConstants.java
index 59773d24..7e1b8095 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/ICursorConstants.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/ICursorConstants.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/IFlyoutPreferences.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/IFlyoutPreferences.java
similarity index 89%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/IFlyoutPreferences.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/IFlyoutPreferences.java
index 933740dc..62bb6c55 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/flyout/IFlyoutPreferences.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/flyout/IFlyoutPreferences.java
@@ -9,7 +9,7 @@
  *    Google, Inc. - initial API and implementation
  *    Tamas Szabo - code extensions, modifications
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.content.flyout;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout;
 
 public interface IFlyoutPreferences {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherContentProvider.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherContentProvider.java
index a51531a4..a132e53a 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherContentProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherLabelProvider.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherLabelProvider.java
index 919c51b7..b75d389b 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherLabelProvider.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java
index 74f12eeb..b8d2407a 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRoot.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,8 +19,8 @@
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.ui.IEditorPart;
 
 public class MatcherTreeViewerRoot {
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java
index c0163f3d..20e5d71e 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/MatcherTreeViewerRootKey.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.resource.Resource;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatch.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatch.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatch.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatch.java
index 04c8afcc..3e93fbaa 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatch.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatch.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.List;
 
@@ -19,8 +19,8 @@
 import org.eclipse.incquery.databinding.runtime.adapter.DatabindingAdapterUtil;
 import org.eclipse.incquery.databinding.runtime.api.IncQueryObservables;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 
 /**
  * A PatternMatch is associated to every match of a matcher.
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java
index e0283957..1c07b711 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcher.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,8 +29,8 @@
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.rete.misc.DeltaMonitor;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.swt.widgets.Display;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java
index 4dd60c22..cb8b8ed3 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/ObservablePatternMatcherRoot.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
@@ -31,11 +31,11 @@
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.extensibility.EngineTaintListener;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.preference.PreferenceConstants;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.preference.PreferenceConstants;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 import org.eclipse.ui.IEditorPart;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatch.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatch.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatch.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatch.java
index e5901f74..37daf853 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatch.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatch.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.List;
 
@@ -19,8 +19,8 @@
 import org.eclipse.incquery.databinding.runtime.adapter.DatabindingAdapterUtil;
 import org.eclipse.incquery.databinding.runtime.api.IncQueryObservables;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 
 /**
  * A PatternMatch is associated to every match of a matcher.
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcher.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcher.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcher.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcher.java
index d5715a5f..35f3578c 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcher.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcher.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,7 +20,7 @@
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.rete.misc.DeltaMonitor;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
 
 /**
  * A PatternMatcher is associated to every IncQueryMatcher which is annotated with PatternUI annotation.
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcherRoot.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcherRoot.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcherRoot.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcherRoot.java
index 1d48714c..e8ba39c4 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/matcher/PatternMatcherRoot.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/matcher/PatternMatcherRoot.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.matcher;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,8 +26,8 @@
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
 import org.eclipse.ui.IEditorPart;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComponent.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComponent.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComponent.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComponent.java
index a338a4df..13edb8bf 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComponent.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComponent.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComposite.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComposite.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComposite.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComposite.java
index d70db2af..2710d8ef 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternComposite.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternComposite.java
@@ -9,14 +9,14 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternLeaf.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternLeaf.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternLeaf.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternLeaf.java
index e5d19693..aadd7444 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternLeaf.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternLeaf.java
@@ -9,9 +9,9 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java
index 082c3b62..337b8086 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatContentProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java
index 37aa1484..58fdc7c1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerFlatLabelProvider.java
@@ -9,9 +9,9 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java
index 027f0e12..7f5638e3 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalContentProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java
index 931a0727..2d0c75ec 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerHierarchicalLabelProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 public class PatternsViewerHierarchicalLabelProvider extends
 		PatternsViewerFlatLabelProvider {
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java
index 319b6056..7510f88d 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/content/patternsviewer/PatternsViewerInput.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.content.patternsviewer;
+package org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer;
 
 public class PatternsViewerInput {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqModelHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqModelHandler.java
similarity index 76%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqModelHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqModelHandler.java
index d6993174..f0fd2344 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqModelHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqModelHandler.java
@@ -9,16 +9,16 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.EMFModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.ModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.EMFModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.ModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqPatternHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqPatternHandler.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqPatternHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqPatternHandler.java
index 71c1c6d8..24c9acc7 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadEiqPatternHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadEiqPatternHandler.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadModelHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadModelHandler.java
similarity index 78%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadModelHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadModelHandler.java
index 5da3e53d..fb1f5b13 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadModelHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadModelHandler.java
@@ -8,17 +8,17 @@
  * Contributors:
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.adapters.AdapterUtil;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.EMFModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.ModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.adapters.AdapterUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.EMFModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.ModelConnector;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadResourceHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadResourceHandler.java
similarity index 82%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadResourceHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadResourceHandler.java
index 0a91aa6a..3f515216 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/LoadResourceHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/LoadResourceHandler.java
@@ -9,16 +9,16 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.EMFModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.ModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.EMFModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.ModelConnector;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PackagePresentationHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PackagePresentationHandler.java
similarity index 87%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PackagePresentationHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PackagePresentationHandler.java
index a0d4d458..43fb0464 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PackagePresentationHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PackagePresentationHandler.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
 
 public class PackagePresentationHandler extends AbstractHandler {
 	
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java
similarity index 85%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java
index eeca76fe..66e4c975 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternRegitryShowLocationHandler.java
@@ -9,14 +9,14 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternLeaf;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternLeaf;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 import org.eclipse.jface.viewers.TreeSelection;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternUnregistrationHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternUnregistrationHandler.java
similarity index 83%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternUnregistrationHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternUnregistrationHandler.java
index ed3cff75..898d127c 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/PatternUnregistrationHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/PatternUnregistrationHandler.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import java.util.List;
 
@@ -17,11 +17,11 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComposite;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternLeaf;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComposite;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternLeaf;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 import org.eclipse.jface.viewers.TreeSelection;
 
 /**
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ResetUIHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ResetUIHandler.java
similarity index 85%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ResetUIHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ResetUIHandler.java
index 3c9b3f5c..f197e59a 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ResetUIHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ResetUIHandler.java
@@ -9,16 +9,16 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.handlers.util.ModelConnector;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util.ModelConnector;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 
 public class ResetUIHandler extends AbstractHandler {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java
index 3e58e9ea..7d9d7813 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrationHandler.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java
similarity index 83%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java
index 616a2f4f..a281ee1a 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherRegistrator.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,15 +19,15 @@
 import org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.flyout.FlyoutControlComposite;
-import org.eclipse.incquery.ui.queryexplorer.content.flyout.IFlyoutPreferences;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComponent;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComposite;
-import org.eclipse.incquery.ui.queryexplorer.util.DatabindingUtil;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout.FlyoutControlComposite;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.flyout.IFlyoutPreferences;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComponent;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComposite;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.DatabindingUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 
 import com.google.inject.Inject;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java
similarity index 78%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java
index b20c026e..c8916003 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/RuntimeMatcherUnRegistrator.java
@@ -9,17 +9,17 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 
 public class RuntimeMatcherUnRegistrator implements Runnable {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ShowLocationHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ShowLocationHandler.java
similarity index 87%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ShowLocationHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ShowLocationHandler.java
index d707fa0c..34f33523 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/ShowLocationHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/ShowLocationHandler.java
@@ -9,18 +9,18 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatch;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
-import org.eclipse.incquery.ui.queryexplorer.util.PatternRegistry;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatch;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcher;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.PatternRegistry;
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeSelection;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/UnloadModelHandler.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/UnloadModelHandler.java
similarity index 85%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/UnloadModelHandler.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/UnloadModelHandler.java
index 9937a3e8..089a1d88 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/UnloadModelHandler.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/UnloadModelHandler.java
@@ -9,13 +9,13 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.handlers;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/EMFModelConnector.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/EMFModelConnector.java
similarity index 88%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/EMFModelConnector.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/EMFModelConnector.java
index 274e5fef..ef0edff1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/EMFModelConnector.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/EMFModelConnector.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.handlers.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -19,10 +19,10 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.util.ModelEditorPartListener;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.util.ModelEditorPartListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreePath;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/ModelConnector.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/ModelConnector.java
similarity index 83%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/ModelConnector.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/ModelConnector.java
index 034cf0ec..01e4f7ec 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/handlers/util/ModelConnector.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/handlers/util/ModelConnector.java
@@ -8,12 +8,12 @@
  * Contributors:
  *   Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.handlers.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.handlers.util;
 
 import org.eclipse.core.runtime.ILog;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PatternInitializationPreferencePage.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
index 2dfaedcc..0f625095 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PatternInitializationPreferencePage.java
@@ -9,9 +9,9 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.preference;
+package org.eclipse.incquery.tooling.ui.queryexplorer.preference;
 
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PreferenceConstants.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PreferenceConstants.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PreferenceConstants.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PreferenceConstants.java
index ad5e3368..a774b3e0 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/preference/PreferenceConstants.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/preference/PreferenceConstants.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.preference;
+package org.eclipse.incquery.tooling.ui.queryexplorer.preference;
 
 public class PreferenceConstants {
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/BasePartListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/BasePartListener.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/BasePartListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/BasePartListener.java
index 537f0db5..3966dde5 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/BasePartListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/BasePartListener.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Szabo Tamas - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IWorkbenchPart;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CheckStateListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CheckStateListener.java
similarity index 84%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CheckStateListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CheckStateListener.java
index 98d7258e..fb35a6b8 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CheckStateListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CheckStateListener.java
@@ -9,14 +9,14 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComponent;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternComposite;
-import org.eclipse.incquery.ui.queryexplorer.content.patternsviewer.PatternLeaf;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComponent;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternComposite;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.patternsviewer.PatternLeaf;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.ICheckStateListener;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CommandConstants.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CommandConstants.java
similarity index 89%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CommandConstants.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CommandConstants.java
index db9903af..a8e37878 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/CommandConstants.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/CommandConstants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Abel Hegedus - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 /**
  * @author Abel Hegedus
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DatabindingUtil.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DatabindingUtil.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DatabindingUtil.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DatabindingUtil.java
index 3ddff32b..a70cecd3 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DatabindingUtil.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DatabindingUtil.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -54,9 +54,9 @@
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.extensibility.MatcherFactoryRegistry;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.ObservablePatternMatcherRoot;
 import org.eclipse.xtext.ui.resource.IResourceSetProvider;
 
 import com.google.inject.Inject;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DeltaVisitor.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DeltaVisitor.java
similarity index 90%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DeltaVisitor.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DeltaVisitor.java
index 9f40dbdb..d1e7c0e5 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DeltaVisitor.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DeltaVisitor.java
@@ -9,13 +9,13 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.incquery.ui.queryexplorer.handlers.RuntimeMatcherRegistrator;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.RuntimeMatcherRegistrator;
 import org.eclipse.swt.widgets.Display;
 
 import com.google.inject.Injector;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DoubleClickListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DoubleClickListener.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DoubleClickListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DoubleClickListener.java
index f791dfb8..831a60e1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/DoubleClickListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/DoubleClickListener.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/FileEditorPartListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/FileEditorPartListener.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/FileEditorPartListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/FileEditorPartListener.java
index 20859989..61180452 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/FileEditorPartListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/FileEditorPartListener.java
@@ -8,10 +8,10 @@
  * Contributors:
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.incquery.ui.queryexplorer.handlers.RuntimeMatcherUnRegistrator;
+import org.eclipse.incquery.tooling.ui.queryexplorer.handlers.RuntimeMatcherUnRegistrator;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ModelEditorPartListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ModelEditorPartListener.java
similarity index 86%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ModelEditorPartListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ModelEditorPartListener.java
index e284dd56..8099aa1a 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ModelEditorPartListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ModelEditorPartListener.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *   Andras Okros - rework to use adapters
  *******************************************************************************/
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.incquery.ui.queryexplorer.QueryExplorer;
-import org.eclipse.incquery.ui.queryexplorer.adapters.AdapterUtil;
-import org.eclipse.incquery.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
+import org.eclipse.incquery.tooling.ui.queryexplorer.QueryExplorer;
+import org.eclipse.incquery.tooling.ui.queryexplorer.adapters.AdapterUtil;
+import org.eclipse.incquery.tooling.ui.queryexplorer.content.matcher.MatcherTreeViewerRootKey;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/PatternRegistry.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/PatternRegistry.java
similarity index 98%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/PatternRegistry.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/PatternRegistry.java
index 489653b2..da5519c0 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/PatternRegistry.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/PatternRegistry.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,7 +28,7 @@
 import org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.ui.PlatformUI;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ResourceChangeListener.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ResourceChangeListener.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ResourceChangeListener.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ResourceChangeListener.java
index 1b8682c4..05c20f18 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/queryexplorer/util/ResourceChangeListener.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/queryexplorer/util/ResourceChangeListener.java
@@ -9,12 +9,12 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.queryexplorer.util;
+package org.eclipse.incquery.tooling.ui.queryexplorer.util;
 
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 
 import com.google.inject.Injector;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizard.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizard.java
similarity index 97%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizard.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizard.java
index f33727ee..e32104f0 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizard.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizard.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -35,8 +35,8 @@
 import org.eclipse.incquery.patternlanguage.patternLanguage.PatternBody;
 import org.eclipse.incquery.patternlanguage.patternLanguage.PatternLanguageFactory;
 import org.eclipse.incquery.patternlanguage.patternLanguage.Variable;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.wizards.internal.ObjectParameter;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ObjectParameter;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java
index 870b1e41..8db8e761 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardContainerConfigurationPage.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -19,7 +19,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java
similarity index 91%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java
index 280edc60..009621e1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqFileWizardPatternConfigurationPage.java
@@ -9,18 +9,18 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
-import org.eclipse.incquery.ui.wizards.internal.ImportListAdapter;
-import org.eclipse.incquery.ui.wizards.internal.ImportListLabelProvider;
-import org.eclipse.incquery.ui.wizards.internal.ObjectListAdapter;
-import org.eclipse.incquery.ui.wizards.internal.ObjectListLabelProvider;
-import org.eclipse.incquery.ui.wizards.internal.ObjectParameter;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ImportListAdapter;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ImportListLabelProvider;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ObjectListAdapter;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ObjectListLabelProvider;
+import org.eclipse.incquery.tooling.ui.wizards.internal.ObjectParameter;
 import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
 import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqGenmodelPage.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqGenmodelPage.java
similarity index 99%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqGenmodelPage.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqGenmodelPage.java
index 242b6ea2..ef24e5f6 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewEiqGenmodelPage.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewEiqGenmodelPage.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.util.List;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewGenmodelWizard.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewGenmodelWizard.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewGenmodelWizard.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewGenmodelWizard.java
index 27210370..4a4035c7 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewGenmodelWizard.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewGenmodelWizard.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -21,9 +21,9 @@
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
 import org.eclipse.incquery.tooling.core.project.IncQueryNature;
-import org.eclipse.incquery.ui.wizards.internal.operations.CompositeWorkspaceModifyOperation;
-import org.eclipse.incquery.ui.wizards.internal.operations.CreateGenmodelOperation;
-import org.eclipse.incquery.ui.wizards.internal.operations.EnsureProjectDependencies;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.CompositeWorkspaceModifyOperation;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.CreateGenmodelOperation;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.EnsureProjectDependencies;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewProjectWizard.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewProjectWizard.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewProjectWizard.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewProjectWizard.java
index 662982d0..40f8b5b1 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/NewProjectWizard.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/NewProjectWizard.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
@@ -25,9 +25,9 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
-import org.eclipse.incquery.ui.wizards.internal.operations.CompositeWorkspaceModifyOperation;
-import org.eclipse.incquery.ui.wizards.internal.operations.CreateGenmodelOperation;
-import org.eclipse.incquery.ui.wizards.internal.operations.CreateProjectOperation;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.CompositeWorkspaceModifyOperation;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.CreateGenmodelOperation;
+import org.eclipse.incquery.tooling.ui.wizards.internal.operations.CreateProjectOperation;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/SelectIncQueryProjectPage.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/SelectIncQueryProjectPage.java
similarity index 99%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/SelectIncQueryProjectPage.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/SelectIncQueryProjectPage.java
index 7eb38ac1..b1ab9df8 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/SelectIncQueryProjectPage.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/SelectIncQueryProjectPage.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards;
+package org.eclipse.incquery.tooling.ui.wizards;
 
 import java.util.Iterator;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialog.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialog.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialog.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialog.java
index 598616d5..e847aa41 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialog.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialog.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialogContentProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialogContentProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
index 709c84cb..bd8504d7 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ElementSelectionDialogContentProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ElementSelectionDialogContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Tamas Szabo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import java.util.Collection;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListAdapter.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListAdapter.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListAdapter.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListAdapter.java
index 9636b01b..0a6b1067 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListAdapter.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListAdapter.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,8 +21,8 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
-import org.eclipse.incquery.ui.wizards.NewEiqFileWizardContainerConfigurationPage;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.wizards.NewEiqFileWizardContainerConfigurationPage;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
 import org.eclipse.ui.PlatformUI;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListLabelProvider.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListLabelProvider.java
index e616ba24..34664ae6 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ImportListLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ImportListLabelProvider.java
@@ -9,10 +9,10 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListAdapter.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListAdapter.java
similarity index 92%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListAdapter.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListAdapter.java
index 7dc3c4af..abf7d512 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListAdapter.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListAdapter.java
@@ -9,10 +9,10 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.incquery.ui.wizards.NewEiqFileWizardPatternConfigurationPage;
+import org.eclipse.incquery.tooling.ui.wizards.NewEiqFileWizardPatternConfigurationPage;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
 import org.eclipse.jface.dialogs.Dialog;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListLabelProvider.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListLabelProvider.java
index d97d0f21..4e14a692 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectListLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectListLabelProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameter.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameter.java
similarity index 93%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameter.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameter.java
index 337783c0..3e2fc596 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameter.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameter.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import org.eclipse.emf.ecore.EClassifier;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationDialog.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
similarity index 97%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationDialog.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
index 73c2a034..ed111b44 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationDialog.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationDialog.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
similarity index 94%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
index d96108e0..ad4f0e64 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/ObjectParameterConfigurationLabelProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi, Tamas Szabo - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal;
+package org.eclipse.incquery.tooling.ui.wizards.internal;
 
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
index 32885070..b4a10814 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CompositeWorkspaceModifyOperation.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal.operations;
+package org.eclipse.incquery.tooling.ui.wizards.internal.operations;
 
 import java.lang.reflect.InvocationTargetException;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateGenmodelOperation.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
similarity index 96%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateGenmodelOperation.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
index c8211f63..de288bd5 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateGenmodelOperation.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateGenmodelOperation.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal.operations;
+package org.eclipse.incquery.tooling.ui.wizards.internal.operations;
 
 import java.io.IOException;
 import java.util.List;
@@ -28,7 +28,7 @@
 import org.eclipse.incquery.tooling.generator.model.generatorModel.GeneratorModelFactory;
 import org.eclipse.incquery.tooling.generator.model.generatorModel.GeneratorModelReference;
 import org.eclipse.incquery.tooling.generator.model.generatorModel.IncQueryGeneratorModel;
-import org.eclipse.incquery.ui.IncQueryGUIPlugin;
+import org.eclipse.incquery.tooling.ui.IncQueryGUIPlugin;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.xtext.ui.resource.IResourceSetProvider;
 import org.eclipse.xtext.util.StringInputStream;
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateProjectOperation.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateProjectOperation.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
index ac0de230..02a9dd52 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/CreateProjectOperation.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/CreateProjectOperation.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal.operations;
+package org.eclipse.incquery.tooling.ui.wizards.internal.operations;
 
 import java.util.List;
 
diff --git a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/EnsureProjectDependencies.java b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
similarity index 95%
rename from plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/EnsureProjectDependencies.java
rename to plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
index b63fd97d..22595040 100644
--- a/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/ui/wizards/internal/operations/EnsureProjectDependencies.java
+++ b/plugins/org.eclipse.incquery.tooling.ui/src/org/eclipse/incquery/tooling/ui/wizards/internal/operations/EnsureProjectDependencies.java
@@ -9,7 +9,7 @@
  *   Tamas Szabo, Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.ui.wizards.internal.operations;
+package org.eclipse.incquery.tooling.ui.wizards.internal.operations;
 
 import java.util.List;