diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
index 69a6a0e8d0f71b3ccbffcc4261fd8cb4f0f4df7e..7e162c240451016e64cf4b90c53bc0d1310492ea 100644
--- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
@@ -58,6 +58,13 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.runtime.qm,
  org.jkiss.dbeaver.runtime.qm.meta,
  org.jkiss.dbeaver.runtime.sql,
+ org.jkiss.dbeaver.tools,
+ org.jkiss.dbeaver.tools.data,
+ org.jkiss.dbeaver.tools.data.encoders,
+ org.jkiss.dbeaver.tools.data.handlers,
+ org.jkiss.dbeaver.tools.data.impl,
+ org.jkiss.dbeaver.tools.data.wizard,
+ org.jkiss.dbeaver.tools.project,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.actions,
  org.jkiss.dbeaver.ui.actions.common,
@@ -97,12 +104,6 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.ui.editors.sql.syntax,
  org.jkiss.dbeaver.ui.editors.sql.util,
  org.jkiss.dbeaver.ui.editors.text,
- org.jkiss.dbeaver.ui.export.data,
- org.jkiss.dbeaver.ui.export.data.encoders,
- org.jkiss.dbeaver.ui.export.data.handlers,
- org.jkiss.dbeaver.ui.export.data.impl,
- org.jkiss.dbeaver.ui.export.data.wizard,
- org.jkiss.dbeaver.ui.export.project,
  org.jkiss.dbeaver.ui.preferences,
  org.jkiss.dbeaver.ui.properties,
  org.jkiss.dbeaver.ui.properties.tabbed,
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index 825a15e23c42a1a9941138aae6a228fe9fb605df..e3a02f472f54f77d1528986851fbc3926b6b2bba 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -356,7 +356,7 @@
                 </with>
             </activeWhen>
         </handler>
-        <handler commandId="org.jkiss.dbeaver.core.export.data" class="org.jkiss.dbeaver.ui.export.data.handlers.DataExportHandler">
+        <handler commandId="org.jkiss.dbeaver.core.export.data" class="org.jkiss.dbeaver.tools.data.handlers.DataExportHandler">
             <enabledWhen>
                 <with variable="selection">
                     <count value="+"/>
@@ -1714,7 +1714,7 @@
     <extension point="org.jkiss.dbeaver.dataExportProvider">
         <export
                 id="org.jkiss.dbeaver.core.dataExport.html"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterHTML"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterHTML"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.html.description"
                 extension="html"
                 icon="icons/misc/html.png"
@@ -1725,7 +1725,7 @@
         </export>
         <export
                 id="org.jkiss.dbeaver.core.dataExport.csv"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterCSV"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterCSV"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.csv.description"
                 extension="csv"
                 icon="icons/misc/csv.png"
@@ -1738,7 +1738,7 @@
         </export>
         <export
                 id="org.jkiss.dbeaver.core.dataExport.sql"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterSQL"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterSQL"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.sql.description"
                 extension="sql"
                 icon="icons/misc/sql.png"
@@ -1780,7 +1780,7 @@
         <category id="org.jkiss.dbeaver.core.export.resources" name="DBeaver"/>
         <wizard
              category="org.jkiss.dbeaver.core.export.resources"
-             class="org.jkiss.dbeaver.ui.export.project.ProjectExportWizard"
+             class="org.jkiss.dbeaver.tools.project.ProjectExportWizard"
              icon="icons/project.png"
              id="org.jkiss.dbeaver.core.wizard.export.project"
              name="Project">
@@ -1790,7 +1790,7 @@
         </wizard>
         <wizard
              category="org.jkiss.dbeaver.core.export.resources"
-             class="org.jkiss.dbeaver.ui.export.scripts.ScriptsExportWizard"
+             class="org.jkiss.dbeaver.tools.scripts.ScriptsExportWizard"
              icon="icons/sql/sql_script.png"
              id="org.jkiss.dbeaver.core.wizard.export.scripts"
              name="Scripts">
@@ -1804,7 +1804,7 @@
         <category id="org.jkiss.dbeaver.core.import.resources" name="DBeaver"/>
         <wizard
             category="org.jkiss.dbeaver.core.import.resources"
-            class="org.jkiss.dbeaver.ui.export.project.ProjectImportWizard"
+            class="org.jkiss.dbeaver.tools.project.ProjectImportWizard"
             icon="icons/project.png"
             id="org.jkiss.dbeaver.core.wizard.import.project"
             name="Project">
@@ -1814,7 +1814,7 @@
         </wizard>
         <wizard
             category="org.jkiss.dbeaver.core.import.resources"
-            class="org.jkiss.dbeaver.ui.export.scripts.ScriptsImportWizard"
+            class="org.jkiss.dbeaver.tools.scripts.ScriptsImportWizard"
             icon="icons/sql/sql_script.png"
             id="org.jkiss.dbeaver.core.wizard.import.scripts"
             name="Scripts">
@@ -1828,7 +1828,7 @@
         <category id="org.jkiss.dbeaver.core.new.general" name="DBeaver"/>
         <wizard
              category="org.jkiss.dbeaver.core.new.general"
-             class="org.jkiss.dbeaver.ui.export.project.ProjectCreateWizard"
+             class="org.jkiss.dbeaver.tools.project.ProjectCreateWizard"
              icon="icons/project.png"
              id="org.jkiss.dbeaver.core.wizard.new.project"
              name="Project">
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
index cf36745db4f83ab7ba3b63f60c7bf7472f9e3377..baa7bbf8b287e4bd883adf388a507761accc9355 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
@@ -113,7 +113,7 @@ public class ScriptsHandlerImpl extends AbstractResourceHandler {
         }
 
         // Make new script file
-        IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, CoreMessages.model_project_Script, SCRIPT_FILE_EXTENSION);
+        IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, "Script", SCRIPT_FILE_EXTENSION);
         tempFile.create(new ByteArrayInputStream(new byte[]{}), true, progressMonitor);
 
         // Save ds container reference
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java
index 4556095fb3039a5715bdbf4b1e97b486646b4fd9..d8c71934994037831692e941dc1f8fe7f2333990 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java
@@ -40,8 +40,6 @@ import java.util.List;
  */
 public class DBNResource extends DBNNode
 {
-    private final String PROJECT_CFG_FILE = ".project";
-
     private IResource resource;
     private DBPResourceHandler handler;
     private List<DBNNode> children;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java
index 5a8bcc0bd52e8961af0dbd5fe899cd3ecf9838d9..4f84445bf9a43dd3548bbcaad9b63430c5908b6e 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java
@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
 import org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx;
 import org.jkiss.utils.CommonUtils;
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java
index e40ecfa33e5c085a3f6d2b5c38178d6d19591537..4e2731e779df397c4125b0833ca4fa9f1cf93975 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java
@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 
 /**
  * DataSourceToolDescriptor
@@ -66,10 +66,10 @@ public class DataSourceToolDescriptor extends AbstractContextDescriptor
         return icon;
     }
 
-    public DBPTool createTool()
+    public IExternalTool createTool()
         throws DBException
     {
-        Class<DBPTool> toolClass = getObjectClass(toolClassName, DBPTool.class);
+        Class<IExternalTool> toolClass = getObjectClass(toolClassName, IExternalTool.class);
         if (toolClass == null) {
             throw new DBException("Tool class '" + toolClassName + "' not found");
         }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
index 9e890740dc9637ea7d944a1dd70e69760013b411..0dba79773d710bb257fcacae8e199834677c0c66 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
@@ -1144,7 +1144,9 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
         xml.addAttribute(RegistryConstants.ATTR_CUSTOM, this.isCustom());
         xml.addAttribute(RegistryConstants.ATTR_NAME, this.getName());
         xml.addAttribute(RegistryConstants.ATTR_CLASS, this.getDriverClassName());
-        xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL());
+        if (!CommonUtils.isEmpty(this.getSampleURL())) {
+            xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL());
+        }
         if (this.getDefaultPort() != null) {
             xml.addAttribute(RegistryConstants.ATTR_PORT, this.getDefaultPort());
         }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java
similarity index 79%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java
index c745db9147f7581ecfc109076433689d6fa2aa46..fbeeee1a5187983dc40cca3de70fa316f4f19cdc 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java
@@ -17,15 +17,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.model;
+package org.jkiss.dbeaver.tools;
 
 import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObject;
 
 /**
- * Database utility
+ * Database external utility.
+ * Usually utilizes external native software to perform specific database tasks.
  */
-public interface DBPTool {
+public interface IExternalTool {
 
     void execute(IWorkbenchWindow window, DBPObject object)
         throws DBException;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java
similarity index 93%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java
index 06a32c545890db7562b386b7a6879484da8f2b8d..c9752615d6ae8e318c3efc008308354ee7464b19 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data;
+package org.jkiss.dbeaver.tools.data;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java
similarity index 94%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java
index f5fe1a75b1f54247832fcbd07faa6770b6b1a10c..a693054600ff9452e3406f0a5f396886b5900f0b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data;
+package org.jkiss.dbeaver.tools.data;
 
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java
similarity index 93%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java
index 6d8a08e54206d6f67afcb5f71b2bfba51d40709f..66bd08e4e7031a0931ffea11d21f0fff7dabe8a2 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data.encoders;
+package org.jkiss.dbeaver.tools.data.encoders;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java
similarity index 91%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java
index 4a582a8791a3a30daeda897ffd07371e42b4c86e..2783eb81ee4c1be84581c58693c525ada151c498 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.handlers;
+package org.jkiss.dbeaver.tools.data.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -28,8 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java
similarity index 89%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java
index 4698de97cb23684e82f6c884fbb871e7bf31db32..745eb2f166c6fae152f570f99a790e4988a1657b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java
@@ -16,14 +16,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDValueHandler;
 import org.jkiss.dbeaver.model.data.DBDValueHandler2;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 
 /**
  * Abstract Exporter
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java
similarity index 95%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java
index 827f71631087e149601297d4154f351cb3e8799d..db98aba3fa42079eb964788d8907ba1aebd36c54 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import java.io.IOException;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java
similarity index 98%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java
index dde085a3162ab29d73fe20f87506a91159e144b3..1167a95e6b1fd9c7fe987f1236f9c7fff3b13270 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import javax.imageio.ImageIO;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java
similarity index 95%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java
index b426d5b2a72d411e5d9af0c0cdea00d75be4efe9..88d57b8939c2d2c9855963f328edbbdc3d00d388 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPNamedObject;
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import java.io.File;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java
similarity index 93%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java
index 8f81180ac8b31fd64ef2433f436c5d1dc63181c2..2e034bd1424545964ca54aedef36cb13e714b822 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java
index f715a04473d716461032e51b2926acd729601219..c809b56b8fe141b209ecf8b798c56e0d3fab0ecf 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java
@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -36,8 +36,8 @@ import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.runtime.AbstractJob;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.Base64;
 import org.jkiss.utils.IOUtils;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java
similarity index 98%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java
index b82705fea826fa0a68bca23dbc8d50dd86179f98..11c76a8e04402a6b42a81248665eebd19090a7e6 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java
index 65bbe1d383f90b02dc906e2013a1577d9db01296..e939a890f0371b4dc64bb38fa8527fb2d00722cf 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.SWT;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java
index 14df10926809249edb015332d2a48a82a5a47756..da21c7fa8cf4ab3e8e6a8c0a1a209997f8ce5fc2 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java
index 0652545c43c2519f593bfdd45012e846dde447e5..c3eada01c3414203bcb2b10c954946c12b069021 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.swt.SWT;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java
similarity index 93%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java
index 7b718983a2992d71480f7ed56dedf34379e89950..e4d44ea9c28325ba1d6d788011aef66723c6b523 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java
index bfb994c12167d37fb1fcac5504fe63e87af4ec23..d0f87df67d26aa280957c920d97e6a097c3ccd77 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java
@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.swt.program.Program;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java
similarity index 98%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java
index 18f2a40727679cfafde91dab51b8fdd824393d73..dd9cd5fae53e3f54d07119395f94ab06c9137136 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java
index 94c98a9e924f045d22c58567fbc910249ca932b0..73f5b6335d6a1c16c0bbb99249d65ea41d596389 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 /**
  * Import/Export constants
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java
similarity index 92%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java
index c417cb86c51c13c113c75bfd1bb2d17cc385db07..bcbe816a1db99318efc8b65038843500c5c17bc9 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 /**
  * Create data
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java
index cdce04fe8c0a6e2ffad8a8900e2746d62434b4c1..aeafb8b79fa53d61304dc75f463e0ba11c8700fb 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java
similarity index 98%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java
index e908f58de4f961841ef72dbdd85863350ccee03a..e3f8836fc4d399f96b6627f59db60c1f383df1ac 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java
similarity index 98%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java
index a24293d5ee21342b5b25c40ba3075b9f91feada9..6847ae604528158783785857e70f2b1a6c8a3136 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java
index 5fb6df13e6c9464cc235a9eb887a58a4a28669bd..5a0bba784d16c1c1554fc5c5630e67b168867df2 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -272,6 +272,8 @@ public class ProjectExportWizard extends Wizard implements IExportWizard {
     private void exportProject(DBRProgressMonitor monitor, ProjectExportData exportData, IProject project) throws InterruptedException, CoreException, IOException
     {
         monitor.subTask(project.getName());
+        // Refresh project
+        project.refreshLocal(IResource.DEPTH_INFINITE, monitor.getNestedMonitor());
 
         // Write meta info
         exportData.meta.startElement(ExportConstants.TAG_PROJECT);
@@ -316,6 +318,9 @@ public class ProjectExportWizard extends Wizard implements IExportWizard {
             // Export children
             final IResource[] members = ((IContainer) resource).members();
             for (IResource child : members) {
+                if (child.isLinked()) {
+                    continue;
+                }
                 exportResourceTree(monitor, exportData, parentPath, child);
             }
         } else if (resource instanceof IFile) {
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java
index bff6236749affe584c9cabf4795efa0e150f2af3..70eb913733e05c000c190c4c7df346c62a12f559 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java
similarity index 95%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java
index c7ba5f9f311b4c434200e9d0e4a6869b84beba61..735e44c5cc216954fd6fc131d4844e783a2dc52b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.wizard.WizardPage;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java
similarity index 97%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java
index ca578aeb52e48a364dd1d46b5e67dae6ae4c082b..5f4192cc8eafddc390c693983845d54fab67cea7 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java
index 4e19ed7fa7af76f58df33d515d9d15898c056579..bb571ee2203a21220470543d2e4dbb0b91711802 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.IMessageProvider;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java
similarity index 97%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java
index f71d46bb4638899ab87ec9c0473313f1afd14a81..7f5a529891e1966ce0a85559d868a6c52c06afc4 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.eclipse.core.resources.IResource;
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java
similarity index 95%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java
index f4755a1776c936584627e52b162f0129ac0164f0..e0f02ff396c96c193b1eea4be5ba087cc4bda53d 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java
index a01e8e5b0179d33f0b11b879b80cd85cdc94b64a..c669133859eb6f148fc1926d6afa5458e34c384b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java
index 4a5b903fdb232fd4a09839c1f17ad4c1729693b4..12e683f433d8bfd3ba499a678d5f72a38790f0e9 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java
similarity index 94%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java
index ac55dda03a30e0b5adbbffa3df48d2a2822064d4..84cd2e5fc63f1b284a1b1a01c636540edeb36436 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.jkiss.dbeaver.model.navigator.DBNResource;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java
index a6be3480067a051af98e40a2791667cf70cd0321..1ba16460fe2f99847d65d7e7a8bc9af4c6b1a0a7 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java
similarity index 99%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java
rename to plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java
index c9bd611d8e6ad7f6dd3df11847ce8aef29f00366..9736c2e08144a272ad8eb7e74b7ea3a301a67fde 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.jface.viewers.*;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java
index 183db0ba57b9c3b19efe8c13f8dc378bd50a0da5..a427606dc9b17988289bf561ed3f365667f3a224 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java
@@ -25,7 +25,7 @@ import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
 import org.jkiss.dbeaver.registry.DataSourceToolDescriptor;
@@ -59,7 +59,7 @@ public class NavigatorActionExecuteTool implements IActionDelegate
     private void executeTool(DBPObject object)
     {
         try {
-            DBPTool toolInstance = tool.createTool();
+            IExternalTool toolInstance = tool.createTool();
             toolInstance.execute(window, DBUtils.getPublicObject(object));
         } catch (DBException e) {
             UIUtils.showErrorDialog(window.getShell(), "Tool error", "Error executing tool '" + tool.getLabel() + "'", e);
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java
index 603546334a9b47a1eadc2e31277fc19e4b915402..adddac23017b6fa78d2ec64496e85498ed210543 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java
@@ -22,7 +22,7 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
-import org.jkiss.dbeaver.ui.export.project.ProjectCreateWizard;
+import org.jkiss.dbeaver.tools.project.ProjectCreateWizard;
 
 public class NavigatorHandlerProjectCreate extends NavigatorHandlerObjectBase {
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
index 31ce7308df2908bcb7168d807193cc3c114ce703..c68a3ff2b6686f6df99e50ecd3e2efdefcbbc602 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
@@ -41,9 +41,7 @@ import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.ISaveablePart2;
-import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.menus.CommandContributionItem;
@@ -60,8 +58,6 @@ import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.data.query.DBQCondition;
 import org.jkiss.dbeaver.model.data.query.DBQOrderColumn;
 import org.jkiss.dbeaver.model.exec.*;
-import org.jkiss.dbeaver.model.navigator.DBNAdapterFactory;
-import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.*;
@@ -83,8 +79,8 @@ import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
 import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
 import org.jkiss.dbeaver.ui.dialogs.EditTextDialog;
 import org.jkiss.dbeaver.ui.dialogs.struct.EditConstraintDialog;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard;
 import org.jkiss.dbeaver.ui.help.IHelpContextIds;
 import org.jkiss.dbeaver.ui.preferences.PrefConstants;
 import org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral;
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java
index 22e3496cd64f2f9b29dbe8c0e246565b23f2711a..5b707b56583b4d42cc59c019878d3e957c8f55aa 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java
@@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database export
  */
-public class MySQLToolExport implements DBPTool
+public class MySQLToolExport implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java
index 1e5882334992bf6ee044449fadd5bf12f7678944..51029b63a5e184e696acc65d5a173671bc1c77f7 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java
@@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database import
  */
-public class MySQLToolImport implements DBPTool
+public class MySQLToolImport implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
index e25374cfce9d5be618468fb9ad0b2d14cb508cef..bfdd674c53f0c9544607e77f5487e7ab9c074a70 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java
@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPConnectionInfo;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.AbstractToolWizard;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 import org.jkiss.utils.CommonUtils;
@@ -35,7 +35,7 @@ import java.util.List;
 /**
  * Database import
  */
-public class MySQLToolScript implements DBPTool
+public class MySQLToolScript implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java
index edb66430afca097fcb3ba8a9c840f8e53db31e5a..8eed0d9dbf167438f29f9ea6b6317051ff09b10e 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java
@@ -22,14 +22,14 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database import
  */
-public class OracleToolScript implements DBPTool
+public class OracleToolScript implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException