diff --git a/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF b/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
index fa42cf825c41b3448d3ad999e0172d9f89fcac60..e796561a02ef31d4f5180ab835f602c01949be3b 100644
--- a/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
+++ b/contrib/drivers/plugins/com.oracle.jdbc/META-INF/MANIFEST.MF
@@ -1,11 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Oracle 11g R2 JDBC Driver
-Bundle-SymbolicName: com.oracle.jdbc
+Bundle-SymbolicName: com.oracle.jdbc;singleton:=true
 Bundle-Version: 11.2.0.1
 Bundle-ClassPath: ojdbc6.jar,
  xdb.jar,
  xmlparserv2.jar
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Oracle Corporation
 Export-Package: oracle.core.lmx,
  oracle.core.lvf,
@@ -60,4 +61,3 @@ Export-Package: oracle.core.lmx,
  oracle.xml.xqxp.functions.builtIns,
  oracle.xml.xslt,
  org.w3c.dom.validation
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/contrib/drivers/plugins/com.oracle.jdbc/build.properties b/contrib/drivers/plugins/com.oracle.jdbc/build.properties
index fdec6011aa76450fda38d0d5f17302beb5a92418..f57007e78cfcbcea0cc8a2f9028e52db71bb80fc 100644
--- a/contrib/drivers/plugins/com.oracle.jdbc/build.properties
+++ b/contrib/drivers/plugins/com.oracle.jdbc/build.properties
@@ -1,3 +1,3 @@
-source.. = 
+source.. = . 
 bin.includes = .,plugin.xml,META-INF/,LICENSE.txt,ojdbc6.jar,xdb.jar,xmlparserv2.jar
 src.includes = 
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/META-INF/MANIFEST.MF b/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/META-INF/MANIFEST.MF
deleted file mode 100644
index 45948ae55b140a7d963207fd091756b42c5b78c3..0000000000000000000000000000000000000000
--- a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Cassandra JDBC driver
-Bundle-SymbolicName: org.jkiss.dbeaver.resources.cassandra;singleton:=true
-Bundle-Version: 1.2.0
-Bundle-Vendor: JKISS
-Bundle-ActivationPolicy: lazy
diff --git a/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.classpath b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.classpath
new file mode 100644
index 0000000000000000000000000000000000000000..4cdc4c7df3633266aeed0f9b4f889c7525fc3863
--- /dev/null
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="apache-cassandra-thrift-1.1.6.jar"/>
+    <classpathentry exported="true" kind="lib" path="cassandra-jkiss-jdbc-1.2.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="libthrift-0.7.0.jar"/>
+    <classpathentry exported="true" kind="lib" path="slf4j-api-1.6.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.project b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.project
new file mode 100644
index 0000000000000000000000000000000000000000..c9311d2fa67adbff2dc23e8753325d6b317a2919
--- /dev/null
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jkiss.jdbc.cassandra</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.jdt.core.prefs b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..f287d53cf450c19c357775d06f02a07c00dcfea6
--- /dev/null
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.pde.core.prefs b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..b7e72d019c22f12b6228457cc2adc52e27c1ab67
--- /dev/null
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/license.txt b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/LICENSE.txt
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/license.txt
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/LICENSE.txt
diff --git a/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/META-INF/MANIFEST.MF b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..469a7db3b4a77b9cecd8a17fbfcea8b62c9b6ad3
--- /dev/null
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache Cassandra JDBC driver
+Bundle-SymbolicName: org.jkiss.jdbc.cassandra;singleton:=true
+Bundle-Version: 1.2.0
+Bundle-Vendor: JKISS
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: apache-cassandra-thrift-1.1.6.jar,
+ cassandra-jkiss-jdbc-1.2.0.jar,
+ libthrift-0.7.0.jar,
+ slf4j-api-1.6.1.jar
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.apache.cassandra.thrift,
+ org.apache.thrift,
+ org.apache.thrift.async,
+ org.apache.thrift.meta_data,
+ org.apache.thrift.protocol,
+ org.apache.thrift.server,
+ org.apache.thrift.transport,
+ org.jkiss.jdbc.cassandra,
+ org.jkiss.jdbc.cassandra.types
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/apache-cassandra-thrift-1.1.6.jar b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/apache-cassandra-thrift-1.1.6.jar
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/apache-cassandra-thrift-1.1.6.jar
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/apache-cassandra-thrift-1.1.6.jar
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/build.properties b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/build.properties
similarity index 93%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/build.properties
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/build.properties
index 03bbbb638cb1bceb3869cebbebe09d0e53be06f1..8c93809244feb6b04e909808c31d6c9732429714 100644
--- a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/build.properties
+++ b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/build.properties
@@ -1,3 +1,3 @@
-source.. = 
+source.. = . 
 bin.includes = .,plugin.xml,META-INF/,drivers/cassandra/license.txt,drivers/cassandra/apache-cassandra-thrift-1.1.6.jar,drivers/cassandra/cassandra-jkiss-jdbc-1.2.0.jar,drivers/cassandra/libthrift-0.7.0.jar,drivers/cassandra/slf4j-api-1.6.1.jar
 src.includes = 
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/cassandra-jkiss-jdbc-1.2.0.jar b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/cassandra-jkiss-jdbc-1.2.0.jar
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/cassandra-jkiss-jdbc-1.2.0.jar
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/cassandra-jkiss-jdbc-1.2.0.jar
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/libthrift-0.7.0.jar b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/libthrift-0.7.0.jar
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/libthrift-0.7.0.jar
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/libthrift-0.7.0.jar
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/plugin.xml b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/plugin.xml
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/plugin.xml
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/plugin.xml
diff --git a/contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/slf4j-api-1.6.1.jar b/contrib/drivers/plugins/org.jkiss.jdbc.cassandra/slf4j-api-1.6.1.jar
similarity index 100%
rename from contrib/drivers/plugins/org.jkiss.dbeaver.resources.cassandra/drivers/cassandra/slf4j-api-1.6.1.jar
rename to contrib/drivers/plugins/org.jkiss.jdbc.cassandra/slf4j-api-1.6.1.jar
diff --git a/docs/todo.txt b/docs/todo.txt
index eda6630b7a89ffac326bf73fc3947bac7efeea82..4b324f6846b52b5b13891ffd44612bc929d776e2 100644
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -17,8 +17,5 @@ Customize resource roots
 
 generate sql
 - exclipse secure store (doesn't work)
-USE JDBC DRIVER API IN PLUGIN (HACK OSGI?)
 
-Cassandra:
-
-compile with 1.6
\ No newline at end of file
+Refactor plugins and onclude jdbc drivers in extension plugins (Oracle, MySQL, Cassandra, WMI)
diff --git a/features/org.jkiss.dbeaver.standalone/feature.xml b/features/org.jkiss.dbeaver.standalone/feature.xml
index 191473c727b5f82bfd198c1682443401e93c7879..6a58530d172026c835f420d5dca07088bfe83e6f 100644
--- a/features/org.jkiss.dbeaver.standalone/feature.xml
+++ b/features/org.jkiss.dbeaver.standalone/feature.xml
@@ -1,98 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.jkiss.dbeaver.standalone"
-      label="%featureName"
-      version="2.2.0"
-      provider-name="%providerName"
-      plugin="org.jkiss.dbeaver.core">
+        id="org.jkiss.dbeaver.standalone"
+        label="%featureName"
+        version="2.2.0"
+        provider-name="%providerName"
+        plugin="org.jkiss.dbeaver.core">
 
-   <description>
-      %description
-   </description>
+    <description>
+        %description
+    </description>
 
-   <copyright>
-      %copyright
-   </copyright>
+    <copyright>
+        %copyright
+    </copyright>
 
-   <license url="%licenseURL">
-      %license
-   </license>
+    <license url="%licenseURL">
+        %license
+    </license>
 
-   <url>
-      <update label="DBeaver Universal Database Manager" url="http://dbeaver.jkiss.org/"/>
-   </url>
+    <url>
+        <update label="DBeaver Universal Database Manager" url="http://dbeaver.jkiss.org/"/>
+    </url>
 
-   <includes
-         id="org.jkiss.dbeaver.rcp"
-         version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.rcp" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.core" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ext.generic" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ext.mysql" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ext.oracle" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ext.cassandra" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ext.wmi" version="0.0.0"/>
 
-   <includes
-         id="org.jkiss.dbeaver.core"
-         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.ui.views.properties.tabbed"/>
+        <import plugin="org.eclipse.swt"/>
+        <import plugin="org.eclipse.jface"/>
+        <import plugin="org.eclipse.jface.text"/>
+        <import plugin="com.jcraft.jsch"/>
+        <import plugin="org.eclipse.ui.views"/>
+        <import plugin="org.eclipse.gef"/>
+    </requires>
 
-   <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.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="com.jcraft.jsch"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.gef"/>
-   </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"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+    <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"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+    <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.oracle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+    <plugin
+            id="org.jkiss.dbeaver.ext.wmi"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
 
-   <plugin
-         id="org.jkiss.dbeaver.ext.wmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+    <plugin
+            id="org.jkiss.wmi"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
 
-   <plugin
-         id="org.jkiss.wmi"
-         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.core.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.nosql.cassandra"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+    <plugin
+            id="org.jkiss.dbeaver.ext.nosql.cassandra"
+            download-size="0"
+            install-size="0"
+            version="0.0.0"
+            unpack="false"/>
 
 </feature>
diff --git a/product/build.xml b/product/build.xml
index b51bdd3bfa691a7b6337fe8217f8694eb0b7fbb2..70086da38d34bf8470df748b3e504d784126f282 100644
--- a/product/build.xml
+++ b/product/build.xml
@@ -70,13 +70,17 @@
             <fileset dir="../eclipse">
                 <include name="**.jar" />
             </fileset>
+            <fileset dir="../contrib/drivers/plugins">
+                <include name="**" />
+            </fileset>
         </copy>
         <echo message="Copy features"/>
         <copy todir="${buildDirectory}/features">
             <fileset dir="../features">
                 <include name="**" />
-                <exclude name="**/.svn" />
-                <exclude name="**/*.class" />
+            </fileset>
+            <fileset dir="../contrib/drivers/features">
+                <include name="**" />
             </fileset>
         </copy>
         <echo message="Copy update site"/>
@@ -168,6 +172,7 @@
         <move file="${repositoryLocation}/dbeaver/features" todir="${repositoryLocation}"/>
         <delete dir="${repositoryLocation}/dbeaver"/>
 
+<!--
         <echo message="Generate JDBC drivers' plugin and features"/>
         <ant dir="../tools/driver-manager" antfile="build.xml" target="generate-features">
             <property name="driversSource" value="../contrib/drivers"/>
@@ -175,6 +180,7 @@
             <property name="targetDirectory" value="${repositoryLocation}"/>
             <property name="updateSiteDirectory" value="${updateSiteLocation}"/>
         </ant>
+-->
         <!-- Generate P2 repository artifacts -->
         <property name="p2.repo.path" value="${buildDirectory}/p2.repo"/>
         <echo message="Publish features and bundles"/>