diff --git a/features/org.jkiss.dbeaver.ce.feature/feature.xml b/features/org.jkiss.dbeaver.ce.feature/feature.xml
index adb2935867ca4581df54e1adad4bfda5c3e63610..b5cb9cc343e57083b6cbfffea7d54316e943ef6a 100644
--- a/features/org.jkiss.dbeaver.ce.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ce.feature/feature.xml
@@ -24,4 +24,6 @@
 
     <includes id="org.jkiss.dbeaver.standalone.feature" version="0.0.0"/>
 
+    <plugin id="org.jkiss.dbeaver.core.application" download-size="0" install-size="0" version="0.0.0"/>
+
 </feature>
diff --git a/features/org.jkiss.dbeaver.core.feature/feature.properties b/features/org.jkiss.dbeaver.core.feature/feature.properties
deleted file mode 100644
index 1ddbce8d8b5c38fb07fa48345d0dfc2ce6757112..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.core.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver Core
-providerName=JKISS
-description=Database management core functionality.
-copyright=(c) JKISS, 2010-2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.exasol.feature/build.properties b/features/org.jkiss.dbeaver.db.feature/build.properties
similarity index 100%
rename from features/org.jkiss.dbeaver.ext.exasol.feature/build.properties
rename to features/org.jkiss.dbeaver.db.feature/build.properties
diff --git a/features/org.jkiss.dbeaver.db.feature/feature.properties b/features/org.jkiss.dbeaver.db.feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..0936a6cbbb99c71fc690bbae13961830cb41aa1f
--- /dev/null
+++ b/features/org.jkiss.dbeaver.db.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=DBeaver Databases
+providerName=JKISS
+description=DBeaver SQL databases support
+copyright=(c) JKISS, 2010-2019
diff --git a/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml b/features/org.jkiss.dbeaver.db.feature/feature.xml
similarity index 75%
rename from features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
rename to features/org.jkiss.dbeaver.db.feature/feature.xml
index db061a01902d2d45197be096eb2b4dabf22f373d..b9a75dff38609d5744f19c61ef9a2b47c9b6316e 100644
--- a/features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.db.feature/feature.xml
@@ -1,52 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-        id="org.jkiss.dbeaver.ext.generic.feature"
-        label="%featureName"
-        version="2.1.95.qualifier"
-        provider-name="%providerName"
-        plugin="org.jkiss.dbeaver.ext.generic">
-
-    <description>
-        %description
-    </description>
-
-    <copyright>
-        %copyright
-    </copyright>
-
-    <license url="%licenseURL">
-        %license
-    </license>
-
-    <requires>
-        <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
-    </requires>
-
-    <plugin id="org.jkiss.dbeaver.ext.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.generic.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
-    <plugin id="org.jkiss.dbeaver.ext.athena" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.bigquery" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.clickhouse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.db2.zos" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.derby" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.es.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.firebird" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.greenplum" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.h2" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.hana" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.hive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.hsqldb" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.informix" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.mssql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.mssql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.netezza" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.phoenix" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.snowflake.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.snowflake.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.sqlite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.teradata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.vertica" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="org.jkiss.dbeaver.db.feature"
+        label="%featureName"
+        version="1.0.0.qualifier"
+        provider-name="%providerName">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <license url="%licenseURL">
+        %license
+    </license>
+
+    <plugin id="org.jkiss.dbeaver.ext.mysql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <plugin id="org.jkiss.dbeaver.ext.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <plugin id="org.jkiss.dbeaver.ext.athena" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.bigquery" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.clickhouse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.db2.zos" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.derby" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.firebird" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.greenplum" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.h2" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.hana" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.hive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.hsqldb" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.informix" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.mssql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.netezza" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.phoenix" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.postgresql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.snowflake.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.sqlite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.teradata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.vertica" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <!-- WMI. Windows-only -->
+    <plugin id="org.jkiss.wmi" os="win32" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
diff --git a/features/org.jkiss.dbeaver.ext.db2.feature/pom.xml b/features/org.jkiss.dbeaver.db.feature/pom.xml
similarity index 84%
rename from features/org.jkiss.dbeaver.ext.db2.feature/pom.xml
rename to features/org.jkiss.dbeaver.db.feature/pom.xml
index 5f12aad6391bfd690cc34a097b50902c5984f492..480e4388a363c16cfd3cd333fd2eb35631627051 100644
--- a/features/org.jkiss.dbeaver.ext.db2.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.db.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.ext.db2.feature</artifactId>
-  <version>2.1.94-SNAPSHOT</version>
+  <artifactId>org.jkiss.dbeaver.db.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.jkiss.dbeaver.core.feature/build.properties b/features/org.jkiss.dbeaver.db.ui.feature/build.properties
similarity index 96%
rename from features/org.jkiss.dbeaver.core.feature/build.properties
rename to features/org.jkiss.dbeaver.db.ui.feature/build.properties
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..b3a611b5c9309d4b5006519942f4e28a0e21e1e4 100644
--- a/features/org.jkiss.dbeaver.core.feature/build.properties
+++ b/features/org.jkiss.dbeaver.db.ui.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = feature.xml,\
-               feature.properties
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.jkiss.dbeaver.db.ui.feature/feature.properties b/features/org.jkiss.dbeaver.db.ui.feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..2ef8044d2279a7d2fc0de45acb2e23f0f9b75b58
--- /dev/null
+++ b/features/org.jkiss.dbeaver.db.ui.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=DBeaver Databases UI
+providerName=JKISS
+description=DBeaver SQL databases UI
+copyright=(c) JKISS, 2010-2019
diff --git a/features/org.jkiss.dbeaver.db.ui.feature/feature.xml b/features/org.jkiss.dbeaver.db.ui.feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab6107fc6c6cb7dc7ab7bccebf214358bda385cc
--- /dev/null
+++ b/features/org.jkiss.dbeaver.db.ui.feature/feature.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="org.jkiss.dbeaver.db.ui.feature"
+        label="%featureName"
+        version="1.0.0.qualifier"
+        provider-name="%providerName">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <license url="%licenseURL">
+        %license
+    </license>
+
+    <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
+
+    <plugin id="org.jkiss.dbeaver.ext.oracle" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.mysql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.db2" download-size="0" install-size="0" version="0.0.0" unpack="true"/>
+    <plugin id="org.jkiss.dbeaver.ext.exasol" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.mssql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.postgresql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.generic.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <plugin id="org.jkiss.dbeaver.ext.es.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.snowflake.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <plugin id="org.jkiss.dbeaver.ext.wmi" os="win32" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
diff --git a/features/org.jkiss.dbeaver.ext.wmi.feature/pom.xml b/features/org.jkiss.dbeaver.db.ui.feature/pom.xml
similarity index 83%
rename from features/org.jkiss.dbeaver.ext.wmi.feature/pom.xml
rename to features/org.jkiss.dbeaver.db.ui.feature/pom.xml
index d8bc220d16a4aa9fea4d5679fcee1b4662758d7d..f16799b880010080da785bc5b72ff1139e6a6241 100644
--- a/features/org.jkiss.dbeaver.ext.wmi.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.db.ui.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.ext.wmi.feature</artifactId>
-  <version>2.0.111-SNAPSHOT</version>
+  <artifactId>org.jkiss.dbeaver.db.ui.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.jkiss.dbeaver.debug.feature/feature.xml b/features/org.jkiss.dbeaver.debug.feature/feature.xml
index 54e137591f5f97b3a572f90f1e5e9e1d45a8b652..0775962f827ca4de56ea560d7442431fced56b9c 100644
--- a/features/org.jkiss.dbeaver.debug.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.debug.feature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.ui.feature" version="1.0.0"/>
    </requires>
 
    <plugin id="org.jkiss.dbeaver.debug.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
diff --git a/features/org.jkiss.dbeaver.ext.db2.feature/feature.properties b/features/org.jkiss.dbeaver.ext.db2.feature/feature.properties
deleted file mode 100644
index 991145115b33780e78e0641fb3caf3b8a718864f..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.db2.feature/feature.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-featureName=DBeaver DB2 Extension
-providerName=JKISS
-description=DBeaver DB2 Extension
-copyright=(c) JKISS and Denis Forveille, 2010-2017
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml b/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
deleted file mode 100644
index 16b908f0f64e152d5e6f45edeaadb369e0aad08a..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.jkiss.dbeaver.ext.db2.feature"
-      label="%featureName"
-      version="2.1.94.qualifier"
-      provider-name="%providerName"
-      plugin="org.jkiss.dbeaver.ext.db2">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
-   </requires>
-
-   <plugin id="org.jkiss.dbeaver.ext.db2" download-size="0" install-size="0" version="0.0.0" unpack="true"/>
-
-</feature>
diff --git a/features/org.jkiss.dbeaver.ext.exasol.feature/feature.properties b/features/org.jkiss.dbeaver.ext.exasol.feature/feature.properties
deleted file mode 100644
index fc1567e13e7dd4c8d85873be40016ccfc4fe1e77..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.exasol.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver Exasol Extension
-providerName=JKISS
-description=DBeaver Exasol Extension
-copyright=(c) JKISS and Karl Griesser, 2016-2017
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.exasol.feature/feature.xml b/features/org.jkiss.dbeaver.ext.exasol.feature/feature.xml
deleted file mode 100644
index 0f308a552e3b939f676906dfdcdc928de4fb591f..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.exasol.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.jkiss.dbeaver.ext.exasol.feature"
-      label="%featureName"
-      version="1.0.67.qualifier"
-      provider-name="%providerName"
-      plugin="org.jkiss.dbeaver.ext.exasol">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="6.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.exasol"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.jkiss.dbeaver.ext.exasol.feature/pom.xml b/features/org.jkiss.dbeaver.ext.exasol.feature/pom.xml
deleted file mode 100644
index 5fda1357f19e57c4e7d8ef5eb9f2cd289e6ae3a1..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.exasol.feature/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-    <artifactId>org.jkiss.dbeaver.ext.exasol.feature</artifactId>
-    <version>1.0.67-SNAPSHOT</version>
-    <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/features/org.jkiss.dbeaver.ext.generic.feature/feature.properties b/features/org.jkiss.dbeaver.ext.generic.feature/feature.properties
deleted file mode 100644
index ba103bd46bf24d9899e72ef13cf699dd6da486c2..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.generic.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver Generic Extension
-providerName=JKISS
-description=DBeaver Generic Extension
-copyright=(c) JKISS, 2010-2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.generic.feature/pom.xml b/features/org.jkiss.dbeaver.ext.generic.feature/pom.xml
deleted file mode 100644
index 3aeb67f1f0b7efaf0b661cab2f48c7414ff94644..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.generic.feature/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <artifactId>org.jkiss.dbeaver.ext.generic.feature</artifactId>
-  <version>2.1.95-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/features/org.jkiss.dbeaver.ext.mysql.feature/build.properties b/features/org.jkiss.dbeaver.ext.mysql.feature/build.properties
deleted file mode 100644
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.mysql.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/org.jkiss.dbeaver.ext.mysql.feature/feature.properties b/features/org.jkiss.dbeaver.ext.mysql.feature/feature.properties
deleted file mode 100644
index 1975c558ec011900a5961e7f6364d336de416cd8..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.mysql.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver MySQL Extension
-providerName=DBeaver Corp
-description=DBeaver MySQL Extension
-copyright=(c) JKISS, 2010-2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.mysql.feature/feature.xml b/features/org.jkiss.dbeaver.ext.mysql.feature/feature.xml
deleted file mode 100644
index 5e15e51cdab4cec1e536f71b7bc1e1dbd9cb9ef0..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.mysql.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-    id="org.jkiss.dbeaver.ext.mysql.feature"
-    label="%featureName"
-    version="2.1.94.qualifier"
-    provider-name="%providerName"
-    plugin="org.jkiss.dbeaver.ext.mysql">
-
-    <description>
-        %description
-    </description>
-
-    <copyright>
-        %copyright
-    </copyright>
-
-    <license url="%licenseURL">
-        %license
-    </license>
-
-    <requires>
-        <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
-    </requires>
-
-    <plugin id="org.jkiss.dbeaver.ext.mysql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.mysql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
-</feature>
diff --git a/features/org.jkiss.dbeaver.ext.oracle.feature/build.properties b/features/org.jkiss.dbeaver.ext.oracle.feature/build.properties
deleted file mode 100644
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.oracle.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.properties b/features/org.jkiss.dbeaver.ext.oracle.feature/feature.properties
deleted file mode 100644
index f4a59826fa0c2fd25644e158f60ddd2e87850b47..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver Oracle Extension
-providerName=JKISS
-description=DBeaver Oracle Extension
-copyright=(c) JKISS, 2010-2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml b/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
deleted file mode 100644
index 3673f41e61ec127a762ab68d669991de021da4dc..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.jkiss.dbeaver.ext.oracle.feature"
-      label="%featureName"
-      version="2.1.94.qualifier"
-      provider-name="%providerName"
-      plugin="org.jkiss.dbeaver.ext.oracle">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
-   </requires>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.oracle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.jkiss.dbeaver.ext.oracle.feature/pom.xml b/features/org.jkiss.dbeaver.ext.oracle.feature/pom.xml
deleted file mode 100644
index 4d09369d51308298779a0d8437e6f664daaf5cde..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.oracle.feature/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <artifactId>org.jkiss.dbeaver.ext.oracle.feature</artifactId>
-  <version>2.1.94-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/features/org.jkiss.dbeaver.ext.wmi.feature/build.properties b/features/org.jkiss.dbeaver.ext.wmi.feature/build.properties
deleted file mode 100644
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.wmi.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/features/org.jkiss.dbeaver.ext.wmi.feature/feature.properties b/features/org.jkiss.dbeaver.ext.wmi.feature/feature.properties
deleted file mode 100644
index 556c404ef52245c6562b261c8bcf5e91b333b01b..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.wmi.feature/feature.properties
+++ /dev/null
@@ -1,207 +0,0 @@
-featureName=DBeaver WMI Extension
-providerName=DBeaver Corp
-description=DBeaver WMI Extension
-copyright=(c) DBeaver Corp, 2010-2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
diff --git a/features/org.jkiss.dbeaver.ext.wmi.feature/feature.xml b/features/org.jkiss.dbeaver.ext.wmi.feature/feature.xml
deleted file mode 100644
index f028d833f20feee7b59fcae4ea091f2b5ee36f62..0000000000000000000000000000000000000000
--- a/features/org.jkiss.dbeaver.ext.wmi.feature/feature.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.jkiss.dbeaver.ext.wmi.feature"
-      label="%featureName"
-      version="2.0.111.qualifier"
-      provider-name="%providerName"
-      plugin="org.jkiss.dbeaver.ext.wmi">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
-   </requires>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.wmi"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.wmi"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.jkiss.dbeaver.ext.db2.feature/build.properties b/features/org.jkiss.dbeaver.ide.feature/build.properties
similarity index 96%
rename from features/org.jkiss.dbeaver.ext.db2.feature/build.properties
rename to features/org.jkiss.dbeaver.ide.feature/build.properties
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..b3a611b5c9309d4b5006519942f4e28a0e21e1e4 100644
--- a/features/org.jkiss.dbeaver.ext.db2.feature/build.properties
+++ b/features/org.jkiss.dbeaver.ide.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = feature.xml,\
-               feature.properties
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.jkiss.dbeaver.ide.feature/feature.properties b/features/org.jkiss.dbeaver.ide.feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9de3df1d446dea5b03b4fb85d540cd806550a98d
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ide.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=DBeaver IDE (Eclipse plugin)
+providerName=JKISS
+description=DBeaver IDE.
+copyright=(c) JKISS, 2010-2019
diff --git a/features/org.jkiss.dbeaver.ide.feature/feature.xml b/features/org.jkiss.dbeaver.ide.feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee8b6c83da6619346a68ddd3e57f4c80e97c4670
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ide.feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="org.jkiss.dbeaver.ide.feature"
+        label="%featureName"
+        version="6.0.5.qualifier"
+        provider-name="%providerName"
+        plugin="org.jkiss.dbeaver.core.eclipse">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <license url="%licenseURL">
+        %license
+    </license>
+
+    <includes id="org.jkiss.dbeaver.runtime.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ui.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.db.ui.feature" version="0.0.0"/>
+
+    <plugin id="org.jkiss.dbeaver.core.eclipse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
diff --git a/features/org.jkiss.dbeaver.core.feature/pom.xml b/features/org.jkiss.dbeaver.ide.feature/pom.xml
similarity index 90%
rename from features/org.jkiss.dbeaver.core.feature/pom.xml
rename to features/org.jkiss.dbeaver.ide.feature/pom.xml
index 87983aa54dab72054c76d6a31ba7bd5c9c8b6aca..70eecc48777acc7fa8fb3580155c88c9d2e7c764 100644
--- a/features/org.jkiss.dbeaver.core.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.ide.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.core.feature</artifactId>
+  <artifactId>org.jkiss.dbeaver.ide.feature</artifactId>
   <version>6.0.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.jkiss.dbeaver.net.sshj.feature/feature.xml b/features/org.jkiss.dbeaver.net.sshj.feature/feature.xml
index f108c651b693ed6057eb185959d4a634bb05f92d..9debf9ddecaaa1db13f44af74955a324f513e44c 100644
--- a/features/org.jkiss.dbeaver.net.sshj.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.net.sshj.feature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
+      <import feature="org.jkiss.dbeaver.runtime.feature" version="1.0.0"/>
    </requires>
 
    <plugin id="org.jkiss.dbeaver.net.ssh.sshj" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
diff --git a/features/org.jkiss.dbeaver.runtime.feature/feature.xml b/features/org.jkiss.dbeaver.runtime.feature/feature.xml
index 95c8f249ee3bc7fd84262196d2e96d3b1a422809..19b680fd14cf579d66eeb2af7a84a7786dcb919d 100644
--- a/features/org.jkiss.dbeaver.runtime.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.runtime.feature/feature.xml
@@ -18,23 +18,21 @@
         %license
     </license>
 
-    <includes
-            id="org.jkiss.dbeaver.core.feature"
-            version="0.0.0"/>
-
     <requires>
         <import plugin="org.eclipse.core.runtime"/>
         <import plugin="org.eclipse.core.resources"/>
         <import plugin="org.eclipse.core.expressions"/>
-        <import plugin="org.eclipse.ui"/>
-        <import plugin="org.eclipse.ui.workbench"/>
-        <import plugin="org.eclipse.ui.workbench.texteditor"/>
-        <import plugin="org.eclipse.swt"/>
-        <import plugin="org.eclipse.jface"/>
-        <import plugin="org.eclipse.jface.text"/>
-        <import plugin="org.eclipse.ui.views"/>
     </requires>
 
-    <plugin id="org.jkiss.dbeaver.core.eclipse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.registry" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.net.ssh" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <!-- 3rd party -->
+    <plugin id="com.github.jsqlparser" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.apache.commons.jexl" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="net.sf.opencsv" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
 
 </feature>
diff --git a/features/org.jkiss.dbeaver.standalone.feature/feature.xml b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
index 0b6d7deeecfe8df48b5d81e46299c4b6082df15a..18cf99e14f4aa913cc8563db1e46c4d820645ba5 100644
--- a/features/org.jkiss.dbeaver.standalone.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
@@ -29,15 +29,19 @@
     </requires>
 
     <includes id="org.jkiss.dbeaver.rcp.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.core.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.generic.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.mysql.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.oracle.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.wmi.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.db2.feature" version="0.0.0"/>
-    <includes id="org.jkiss.dbeaver.ext.exasol.feature" version="0.0.0"/>
+
+    <includes id="org.jkiss.dbeaver.runtime.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ui.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.db.ui.feature" version="0.0.0"/>
+
     <includes id="org.jkiss.dbeaver.debug.feature" version="0.0.0"/>
 
+    <!-- Additional plugins for standalone version -->
+
+    <plugin id="org.jkiss.dbeaver.ext.sample.database" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.ui.tipoftheday" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
     <!-- P2 for RCP -->
     <includes id="org.eclipse.equinox.p2.rcp.feature" version="0.0.0"/>
     <includes id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/>
@@ -58,9 +62,5 @@
     <!-- Custom stuff -->
     <plugin id="org.apache.commons.cli" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
-    <plugin id="org.jkiss.dbeaver.core.application" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.sample.database" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.ui.tipoftheday" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
 
 </feature>
diff --git a/features/org.jkiss.dbeaver.ext.generic.feature/build.properties b/features/org.jkiss.dbeaver.ui.feature/build.properties
similarity index 96%
rename from features/org.jkiss.dbeaver.ext.generic.feature/build.properties
rename to features/org.jkiss.dbeaver.ui.feature/build.properties
index 3104d6d76e702811050e7b169b66d3549ca3a9ec..b3a611b5c9309d4b5006519942f4e28a0e21e1e4 100644
--- a/features/org.jkiss.dbeaver.ext.generic.feature/build.properties
+++ b/features/org.jkiss.dbeaver.ui.feature/build.properties
@@ -1,2 +1,2 @@
-bin.includes = feature.xml,\
-               feature.properties
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.jkiss.dbeaver.ui.feature/feature.properties b/features/org.jkiss.dbeaver.ui.feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..eb1e5b7cb7d8ebad6e9d34bff558b1563fc064e0
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ui.feature/feature.properties
@@ -0,0 +1,4 @@
+featureName=DBeaver desktop UI
+providerName=JKISS
+description=DBeaver desktop UI
+copyright=(c) JKISS, 2010-2019
diff --git a/features/org.jkiss.dbeaver.core.feature/feature.xml b/features/org.jkiss.dbeaver.ui.feature/feature.xml
similarity index 74%
rename from features/org.jkiss.dbeaver.core.feature/feature.xml
rename to features/org.jkiss.dbeaver.ui.feature/feature.xml
index f640896eea32275b9db57505e6fc608447ad3480..c32c7dc94257fb5b638bc3be1c3d2a18792b81bc 100644
--- a/features/org.jkiss.dbeaver.core.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ui.feature/feature.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-        id="org.jkiss.dbeaver.core.feature"
+        id="org.jkiss.dbeaver.ui.feature"
         label="%featureName"
-        version="6.0.5.qualifier"
-        provider-name="%providerName"
-        plugin="org.jkiss.dbeaver.core">
+        version="1.0.0.qualifier"
+        provider-name="%providerName">
 
     <description>
         %description
@@ -19,8 +18,6 @@
     </license>
 
     <requires>
-        <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
-        <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.core.expressions" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.ui" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.ui.workbench" version="0.0.0" match="greaterOrEqual"/>
@@ -36,15 +33,9 @@
         <import plugin="org.eclipse.debug.ui" version="0.0.0" match="greaterOrEqual"/>
     </requires>
 
-    <plugin id="com.github.jsqlparser" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.apache.commons.jexl" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="net.sf.opencsv" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <includes id="org.jkiss.dbeaver.runtime.feature" version="0.0.0"/>
 
-    <plugin id="org.jkiss.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.registry" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.net.ssh" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.net.ssh.jsch" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.net.ssh.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -64,15 +55,11 @@
     <plugin id="org.jkiss.dbeaver.ext.mockdata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.data.transfer" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.import_config" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.format.sqlworkbenchj" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
     <!-- Compare -->
-    <plugin id="org.jkiss.dbeaver.cmp.simple" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.cmp.simple.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
     <!-- Gis -->
-    <plugin id="org.jkiss.bundle.gis" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.data.gis" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.data.gis.view" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
     <!-- Charts -->
diff --git a/features/org.jkiss.dbeaver.ext.mysql.feature/pom.xml b/features/org.jkiss.dbeaver.ui.feature/pom.xml
similarity index 83%
rename from features/org.jkiss.dbeaver.ext.mysql.feature/pom.xml
rename to features/org.jkiss.dbeaver.ui.feature/pom.xml
index 6b93068dd85ee4cceee7492ff5ed0b6b3ba7ee57..98d5ccd5385cb51281dc7baa54e6d090e72768c9 100644
--- a/features/org.jkiss.dbeaver.ext.mysql.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.ui.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.ext.mysql.feature</artifactId>
-  <version>2.1.94-SNAPSHOT</version>
+  <artifactId>org.jkiss.dbeaver.ui.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 72d3b3007de4e874299328b59d4d4a0b1be9b03b..b02509ce24630a1e988a9a65cd2be69339374074 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,21 +13,19 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>org.jkiss.dbeaver.core.feature</module>
-        <module>org.jkiss.dbeaver.debug.feature</module>
-        <module>org.jkiss.dbeaver.ext.db2.feature</module>
-        <module>org.jkiss.dbeaver.ext.generic.feature</module>
-        <module>org.jkiss.dbeaver.ext.mysql.feature</module>
-        <module>org.jkiss.dbeaver.ext.oracle.feature</module>
-        <module>org.jkiss.dbeaver.ext.wmi.feature</module>
-        <module>org.jkiss.dbeaver.ext.exasol.feature</module>
-        <module>org.jkiss.dbeaver.ext.office.feature</module>
-        <module>org.jkiss.dbeaver.ext.ui.svg.feature</module>
-        <module>org.jkiss.dbeaver.net.sshj.feature</module>
         <module>org.jkiss.dbeaver.rcp.feature</module>
         <module>org.jkiss.dbeaver.runtime.feature</module>
+        <module>org.jkiss.dbeaver.ui.feature</module>
+        <module>org.jkiss.dbeaver.db.feature</module>
+        <module>org.jkiss.dbeaver.db.ui.feature</module>
+        <module>org.jkiss.dbeaver.ide.feature</module>
         <module>org.jkiss.dbeaver.standalone.feature</module>
         <module>org.jkiss.dbeaver.ce.feature</module>
+
+        <module>org.jkiss.dbeaver.debug.feature</module>
+        <module>org.jkiss.dbeaver.ext.office.feature</module>
+        <module>org.jkiss.dbeaver.ext.ui.svg.feature</module>
+        <module>org.jkiss.dbeaver.net.sshj.feature</module>
     </modules>
 
 </project>
diff --git a/product/repositories/org.jkiss.dbeaver.ce.repository/category.xml b/product/repositories/org.jkiss.dbeaver.ce.repository/category.xml
index cdb35c1eb655a85ee0272c87203bb6c161b3a349..e581c52ebaadc3a5517d1a0e6850d7d7bd123183 100644
--- a/product/repositories/org.jkiss.dbeaver.ce.repository/category.xml
+++ b/product/repositories/org.jkiss.dbeaver.ce.repository/category.xml
@@ -12,28 +12,16 @@
         <description>DBeaver extensions</description>
     </category-def>
 
-    <feature id="org.jkiss.dbeaver.core.feature">
+    <feature id="org.jkiss.dbeaver.ui.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
     <feature id="org.jkiss.dbeaver.runtime.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
-    <feature id="org.jkiss.dbeaver.ext.generic.feature">
+    <feature id="org.jkiss.dbeaver.db.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
-    <feature id="org.jkiss.dbeaver.ext.mysql.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.oracle.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.db2.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.exasol.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.wmi.feature">
+    <feature id="org.jkiss.dbeaver.db.ui.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
     <feature id="org.jkiss.dbeaver.debug.feature">
diff --git a/product/standalone/category.xml b/product/standalone/category.xml
index 2ae598683ca0daff9675d4b95ecfe98014f7110d..af59a0698ab89fbe54fac26b6b1bbc0cac90226e 100644
--- a/product/standalone/category.xml
+++ b/product/standalone/category.xml
@@ -6,28 +6,16 @@
         <description>Universal Database Manager</description>
     </category-def>
 
-    <feature id="org.jkiss.dbeaver.core.feature">
+    <feature id="org.jkiss.dbeaver.ui.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
     <feature id="org.jkiss.dbeaver.runtime.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
-    <feature id="org.jkiss.dbeaver.ext.generic.feature">
+    <feature id="org.jkiss.dbeaver.db.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>
-    <feature id="org.jkiss.dbeaver.ext.mysql.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.oracle.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.db2.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.exasol.feature">
-        <category name="org.jkiss.dbeaver"/>
-    </feature>
-    <feature id="org.jkiss.dbeaver.ext.wmi.feature">
+    <feature id="org.jkiss.dbeaver.db.ui.feature">
         <category name="org.jkiss.dbeaver"/>
     </feature>