reorganize plugins into modelbase, enablement, connectivity folders

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.0/Derby_10.0.xmi b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.0/Derby_10.0.xmi
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.0/Derby_10.0.xmi
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.0/Derby_10.0.xmi
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.1/Derby_10.1.xmi b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.1/Derby_10.1.xmi
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.1/Derby_10.1.xmi
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.1/Derby_10.1.xmi
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.2/Derby_10.2.xmi b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.2/Derby_10.2.xmi
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.2/Derby_10.2.xmi
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/runtime/vendors/Derby_10.2/Derby_10.2.xmi
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/icons/alias.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/icons/alias.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/icons/alias.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/icons/alias.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/icons/new_db_element.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/icons/new_db_element.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/icons/new_db_element.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/icons/new_db_element.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/DerbyUIPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/DerbyUIPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/DerbyUIPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/DerbyUIPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBProfileDetailsWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBProfileDetailsWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBProfileDetailsWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBProfileDetailsWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/DerbyEmbeddedDBPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/IHelpContextsDerbyProfile.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/IHelpContextsDerbyProfile.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/IHelpContextsDerbyProfile.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/IHelpContextsDerbyProfile.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/NewDerbyEmbeddedConnectionProfileWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/NewDerbyEmbeddedConnectionProfileWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/NewDerbyEmbeddedConnectionProfileWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/NewDerbyEmbeddedConnectionProfileWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyClientDriverUIContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyClientDriverUIContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyClientDriverUIContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyClientDriverUIContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyDriverUIContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyDriverUIContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyDriverUIContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyDriverUIContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyEmbeddedDriverUIContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyEmbeddedDriverUIContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyEmbeddedDriverUIContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyEmbeddedDriverUIContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyOtherDriverUIContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyOtherDriverUIContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyOtherDriverUIContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/DerbyOtherDriverUIContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/drivers/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/connection/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/ServerExplorerContentProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/ServerExplorerContentProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/ServerExplorerContentProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/ServerExplorerContentProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/label/ServerExplorerlabelProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/label/ServerExplorerlabelProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/label/ServerExplorerlabelProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/label/ServerExplorerlabelProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/NodeFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/NodeFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/NodeFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/NodeFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/SynonymFolder.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/SynonymFolder.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/SynonymFolder.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/explorer/providers/virtual/SynonymFolder.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/l10n/derbyUI.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/l10n/derbyUI.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/l10n/derbyUI.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/l10n/derbyUI.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/util/ResourceLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/util/ResourceLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/util/ResourceLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/internal/ui/util/ResourceLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/ISynonymFolder.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/ISynonymFolder.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/ISynonymFolder.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/ISynonymFolder.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/IVirtualNodeServiceFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/IVirtualNodeServiceFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/IVirtualNodeServiceFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/src/org/eclipse/datatools/connectivity/apache/derby/ui/explorer/providers/virtual/IVirtualNodeServiceFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/icons/jdbc_16.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/icons/jdbc_16.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/icons/jdbc_16.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/icons/jdbc_16.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/DerbyPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/DerbyPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/DerbyPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/DerbyPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogCheckConstraint.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogCheckConstraint.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogCheckConstraint.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogCheckConstraint.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogColumn.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogColumn.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogColumn.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogColumn.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogProcedure.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogProcedure.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogProcedure.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogProcedure.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSchema.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSchema.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSchema.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSchema.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSynonym.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSynonym.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSynonym.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogSynonym.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTable.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTable.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTable.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTable.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTrigger.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTrigger.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTrigger.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogTrigger.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogUserDefinedFunction.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogUserDefinedFunction.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogUserDefinedFunction.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogUserDefinedFunction.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogView.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogView.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogView.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyCatalogView.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyRoutineLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyRoutineLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyRoutineLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyRoutineLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbySchemaLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbySchemaLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbySchemaLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbySchemaLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableColumnLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableColumnLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableColumnLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableColumnLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableConstraintLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableConstraintLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableConstraintLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableConstraintLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyTableLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyUserDefinedFunctionParameterLoader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyUserDefinedFunctionParameterLoader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyUserDefinedFunctionParameterLoader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/catalog/DerbyUserDefinedFunctionParameterLoader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyEmbeddedJDBCConnection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyEmbeddedJDBCConnection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyEmbeddedJDBCConnection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyEmbeddedJDBCConnection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyJDBCConnectionFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyJDBCConnectionFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyJDBCConnectionFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyJDBCConnectionFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyPropertiesPersistenceHook.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyPropertiesPersistenceHook.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyPropertiesPersistenceHook.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyPropertiesPersistenceHook.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyShutdownService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyShutdownService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyShutdownService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/DerbyShutdownService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/IDerbyConnectionProfileConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/IDerbyConnectionProfileConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/IDerbyConnectionProfileConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/connection/IDerbyConnectionProfileConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbyGroupID.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbyGroupID.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbyGroupID.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbyGroupID.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbySynonymContainmentProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbySynonymContainmentProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbySynonymContainmentProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/containment/DerbySynonymContainmentProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder101.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder101.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder101.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlBuilder101.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlGenerator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlGenerator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlGenerator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlGenerator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlParser.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlParser.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlParser.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlParser.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlScript.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlScript.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlScript.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/ddl/DerbyDdlScript.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyClientDriverValuesProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyClientDriverValuesProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyClientDriverValuesProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyClientDriverValuesProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider101.java b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider101.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider101.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/src/org/eclipse/datatools/connectivity/apache/internal/derby/driver/DerbyDriverValuesProvider101.java
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/readme.txt b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/readme.txt
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/readme.txt
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/readme.txt
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/EditorCmdAppl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/EditorCmdAppl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/EditorCmdAppl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/EditorCmdAppl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/ProfileFileProcessor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/ProfileFileProcessor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/ProfileFileProcessor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/ProfileFileProcessor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/SystemIOUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/SystemIOUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/SystemIOUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/internal/SystemIOUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/src/org/eclipse/datatools/connectivity/console/profile/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/build.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/build.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/build.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/build.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/icons/new_db_element.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/icons/new_db_element.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/icons/new_db_element.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/icons/new_db_element.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfileDetailsWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfileDetailsWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfileDetailsWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfileDetailsWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfilePropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfilePropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfilePropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/GenericJDBCDBProfilePropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/NewGenericJDBCConnectionProfileWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/NewGenericJDBCConnectionProfileWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/NewGenericJDBCConnectionProfileWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/NewGenericJDBCConnectionProfileWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/drivers/GenericJDBCDriverUIContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/drivers/GenericJDBCDriverUIContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/drivers/GenericJDBCDriverUIContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/internal/ui/drivers/GenericJDBCDriverUIContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfileDetailsWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfileDetailsWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfileDetailsWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfileDetailsWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfilePropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfilePropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfilePropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBProfilePropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBUIPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBUIPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBUIPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/GenericDBUIPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/IHelpContextsGenericDBProfile.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/IHelpContextsGenericDBProfile.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/IHelpContextsGenericDBProfile.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/IHelpContextsGenericDBProfile.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/NewConnectionProfileWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/NewConnectionProfileWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/NewConnectionProfileWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/NewConnectionProfileWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/wizard/NewJDBCFilteredCPWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/wizard/NewJDBCFilteredCPWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/wizard/NewJDBCFilteredCPWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/src/org/eclipse/datatools/connectivity/db/generic/ui/wizard/NewJDBCFilteredCPWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/build.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/build.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/build.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/build.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/icons/jdbc_16.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/icons/jdbc_16.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/icons/jdbc_16.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/icons/jdbc_16.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPropertiesPersistenceHook.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPropertiesPersistenceHook.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPropertiesPersistenceHook.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/GenericDBPropertiesPersistenceHook.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBConnectionProfileConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBConnectionProfileConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBConnectionProfileConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBConnectionProfileConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBDriverDefinitionConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBDriverDefinitionConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBDriverDefinitionConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/IDBDriverDefinitionConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnectionFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnectionFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnectionFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/JDBCConnectionFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/resources.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/resources.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/resources.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/generic/resources.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/internal/generic/IGenericJDBCConnectionProfileConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/internal/generic/IGenericJDBCConnectionProfileConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/internal/generic/IGenericJDBCConnectionProfileConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/src/org/eclipse/datatools/connectivity/db/internal/generic/IGenericJDBCConnectionProfileConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/build.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/runtime/vendors/Generic JDBC_1.0/Generic JDBC_1.0.xmi b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/runtime/vendors/Generic JDBC_1.0/Generic JDBC_1.0.xmi
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/runtime/vendors/Generic JDBC_1.0/Generic JDBC_1.0.xmi
rename to plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/runtime/vendors/Generic JDBC_1.0/Generic JDBC_1.0.xmi
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/build.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/build.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/build.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/build.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/ConnJDTPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/ConnJDTPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/ConnJDTPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/ConnJDTPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerInitializer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerInitializer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerInitializer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerInitializer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathContainerPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathMessages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathMessages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathMessages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/DriverClasspathMessages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.jdt/src/org/eclipse/datatools/connectivity/jdt/internal/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_driverBridge.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_driverBridge.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_driverBridge.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_driverBridge.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_propertyProvider.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_propertyProvider.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_propertyProvider.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema-doc/org_eclipse_datatools_connectivity_oda_consumer_propertyProvider.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/schema/driverBridge.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema/driverBridge.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/schema/driverBridge.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema/driverBridge.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/schema/propertyProvider.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema/propertyProvider.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/schema/propertyProvider.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/schema/propertyProvider.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/BlobReader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/BlobReader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/BlobReader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/BlobReader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ClobReader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ClobReader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ClobReader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ClobReader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ConnectionPropertyHandler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ConnectionPropertyHandler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ConnectionPropertyHandler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/ConnectionPropertyHandler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/DriverExtensionHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/DriverExtensionHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/DriverExtensionHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/DriverExtensionHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaAdvancedQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaAdvancedQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaAdvancedQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaAdvancedQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaBlob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaBlob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaBlob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaBlob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaClob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaClob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaClob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaClob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConnection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConnection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConnection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConnection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConsumerPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConsumerPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConsumerPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaConsumerPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDataSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDataSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDataSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDataSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriver.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriver.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriver.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriver.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriverObject.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriverObject.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriverObject.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaDriverObject.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaHelperException.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaHelperException.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaHelperException.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaHelperException.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaObject.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaObject.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaObject.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaObject.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaParameterMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaParameterMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaParameterMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaParameterMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaResultSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaRowSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaRowSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaRowSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaRowSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaSortSpecHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaSortSpecHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaSortSpecHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/OdaSortSpecHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/helper/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogConfigHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogConfigHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogConfigHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogConfigHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogPathHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogPathHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogPathHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/internal/impl/LogPathHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/IPropertyProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/IPropertyProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/IPropertyProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/IPropertyProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/PropertyProviderImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/PropertyProviderImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/PropertyProviderImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/PropertyProviderImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/ProviderUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/ProviderUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/ProviderUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/impl/ProviderUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/services/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/DriverExtensionManifest.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/DriverExtensionManifest.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/DriverExtensionManifest.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/DriverExtensionManifest.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/ExtensionExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/ExtensionExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/ExtensionExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/ExtensionExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/PropertyProviderManifest.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/PropertyProviderManifest.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/PropertyProviderManifest.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/PropertyProviderManifest.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/src/org/eclipse/datatools/connectivity/oda/consumer/util/manifest/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.ini b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.ini
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.ini
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.ini
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.mappings b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.mappings
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.mappings
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.mappings
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/about.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/about.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.png b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.png
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.png
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/eclipse32.png
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema-doc/org_eclipse_datatools_connectivity_oda_design_ui_datasource.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema-doc/org_eclipse_datatools_connectivity_oda_design_ui_datasource.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema-doc/org_eclipse_datatools_connectivity_oda_design_ui_datasource.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema-doc/org_eclipse_datatools_connectivity_oda_design_ui_datasource.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema/datasource.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema/datasource.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/schema/datasource.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/schema/datasource.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSetDesignSessionBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSetDesignSessionBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSetDesignSessionBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSetDesignSessionBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSourceDesignSessionBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSourceDesignSessionBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSourceDesignSessionBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DataSourceDesignSessionBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignSessionUtilBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignSessionUtilBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignSessionUtilBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignSessionUtilBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignerLogger.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignerLogger.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignerLogger.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/designsession/DesignerLogger.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/AdaptableDataSourceProfile.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/AdaptableDataSourceProfile.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/AdaptableDataSourceProfile.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/AdaptableDataSourceProfile.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetEditorPageCore.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetEditorPageCore.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetEditorPageCore.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetEditorPageCore.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardPageCore.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardPageCore.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardPageCore.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSetWizardPageCore.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceEditorPageCore.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceEditorPageCore.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceEditorPageCore.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceEditorPageCore.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceWizardPageCore.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceWizardPageCore.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceWizardPageCore.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DataSourceWizardPageCore.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DesignerUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DesignerUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DesignerUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/DesignerUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/NewDataSourceWizardBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/NewDataSourceWizardBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/NewDataSourceWizardBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/NewDataSourceWizardBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/OdaProfileUIExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/OdaProfileUIExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/OdaProfileUIExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/OdaProfileUIExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/preferences/OpenDataAccessPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/preferences/OpenDataAccessPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/preferences/OpenDataAccessPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/preferences/OpenDataAccessPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/CreateProfileStoreAction.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/CreateProfileStoreAction.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/CreateProfileStoreAction.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/CreateProfileStoreAction.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionEditorPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionEditorPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionEditorPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionEditorPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionPageHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionPageHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionPageHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionPageHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileSelectionWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileStoreCreationDialog.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileStoreCreationDialog.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileStoreCreationDialog.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/ProfileStoreCreationDialog.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IBrowseButtonHost.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IBrowseButtonHost.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IBrowseButtonHost.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IBrowseButtonHost.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IMenuButtonProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IMenuButtonProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IMenuButtonProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/IMenuButtonProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButton.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButton.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButton.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButton.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButtonProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButtonProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButtonProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/MenuButtonProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfilePathSelectionDialog.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfilePathSelectionDialog.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfilePathSelectionDialog.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfilePathSelectionDialog.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfileStoreBrowseButton.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfileStoreBrowseButton.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfileStoreBrowseButton.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/ProfileStoreBrowseButton.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/UIUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/UIUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/UIUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/browse/UIUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePageWrapper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePageWrapper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePageWrapper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePageWrapper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfilePropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbProfileWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbTypesSelectionPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbTypesSelectionPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbTypesSelectionPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/DbTypesSelectionPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/NewDbDataSourceWizardBase.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/NewDbDataSourceWizardBase.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/NewDbDataSourceWizardBase.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/NewDbDataSourceWizardBase.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/OdaDbProfileWizardNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/OdaDbProfileWizardNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/OdaDbProfileWizardNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/db/OdaDbProfileWizardNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/NewProfileAction.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/NewProfileAction.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/NewProfileAction.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/NewProfileAction.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/OdaProfileActionProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/OdaProfileActionProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/OdaProfileActionProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/OdaProfileActionProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/ProfileFilter.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/ProfileFilter.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/ProfileFilter.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/internal/ui/profile/filter/ProfileFilter.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSetDesignSession.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSetDesignSession.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSetDesignSession.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSetDesignSession.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSourceDesignSession.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSourceDesignSession.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSourceDesignSession.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DataSourceDesignSession.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DesignSessionUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DesignSessionUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DesignSessionUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/DesignSessionUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/designsession/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetPageInfo.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetPageInfo.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetPageInfo.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetPageInfo.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetUIElement.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetUIElement.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetUIElement.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetUIElement.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetWizardInfo.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetWizardInfo.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetWizardInfo.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSetWizardInfo.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSourceWizardInfo.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSourceWizardInfo.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSourceWizardInfo.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/DataSourceWizardInfo.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIExtensionManifest.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIExtensionManifest.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIExtensionManifest.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIExtensionManifest.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIManifestExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIManifestExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIManifestExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/UIManifestExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/manifest/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/TextProcessorWrapper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/TextProcessorWrapper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/TextProcessorWrapper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/TextProcessorWrapper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePageHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePageHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePageHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePageHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourcePropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourceWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourceWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourceWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/pages/impl/DefaultDataSourceWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/DbProfileEditorPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/DbProfileEditorPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/DbProfileEditorPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/DbProfileEditorPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/NewDbDataSourceWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/NewDbDataSourceWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/NewDbDataSourceWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/profile/db/wizards/NewDbDataSourceWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetEditorPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetEditorPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetEditorPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetEditorPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSetWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceEditorPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceEditorPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceEditorPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceEditorPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/DataSourceWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/NewDataSourceWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/NewDataSourceWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/NewDataSourceWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/NewDataSourceWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/src/org/eclipse/datatools/connectivity/oda/design/ui/wizards/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.settings/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.settings/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.core.resources.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.core.resources.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/model/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/model/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/DesignXML.xsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/model/odaDesignSession.genmodel b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/odaDesignSession.genmodel
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/model/odaDesignSession.genmodel
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/odaDesignSession.genmodel
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/model/org.eclipse.datatools.connectivity.oda.design.ecore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AndExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AndExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AndExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AndExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AtomicExpressionContext.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AtomicExpressionContext.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AtomicExpressionContext.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AtomicExpressionContext.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ColumnDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ColumnDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ColumnDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ColumnDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CompositeFilterExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CompositeFilterExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CompositeFilterExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CompositeFilterExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomFilterExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomFilterExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomFilterExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/CustomFilterExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataAccessDesign.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataAccessDesign.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataAccessDesign.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataAccessDesign.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifier.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifier.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifier.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifier.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifiers.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifiers.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifiers.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementIdentifiers.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementUIHints.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementUIHints.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementUIHints.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataElementUIHints.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetDesign.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetDesign.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetDesign.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetDesign.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSourceDesign.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSourceDesign.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSourceDesign.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSourceDesign.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignPackage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionRequest.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionRequest.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionRequest.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionRequest.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionResponse.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionResponse.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionResponse.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignSessionResponse.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerState.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerState.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerState.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerState.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerStateContent.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerStateContent.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerStateContent.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DesignerStateContent.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicFilterExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicFilterExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicFilterExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicFilterExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicValuesQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicValuesQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicValuesQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DynamicValuesQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionArguments.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionArguments.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionArguments.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionArguments.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameterDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameterDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameterDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameterDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameters.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameters.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameters.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionParameters.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariable.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariable.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariable.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariable.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariableType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariableType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariableType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ExpressionVariableType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpressionType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpressionType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpressionType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/FilterExpressionType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementUIHints.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementUIHints.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementUIHints.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputElementUIHints.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterUIHints.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterUIHints.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterUIHints.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputParameterUIHints.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Locale.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Locale.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Locale.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Locale.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NameValuePair.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NameValuePair.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NameValuePair.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NameValuePair.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NotExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NotExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NotExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NotExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NullOrderingType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NullOrderingType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NullOrderingType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/NullOrderingType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaDesignSession.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaDesignSession.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaDesignSession.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaDesignSession.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaScalarDataType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaScalarDataType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaScalarDataType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaScalarDataType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OrExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OrExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OrExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OrExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OutputElementAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OutputElementAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OutputElementAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OutputElementAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFieldDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFieldDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFieldDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFieldDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Properties.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Properties.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Properties.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Properties.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Property.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Property.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Property.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Property.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/PropertyAttributes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/PropertyAttributes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/PropertyAttributes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/PropertyAttributes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetCriteria.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetCriteria.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetCriteria.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetCriteria.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSubset.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSubset.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSubset.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSubset.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortDirectionType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortDirectionType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortDirectionType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortDirectionType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortKey.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortKey.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortKey.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortKey.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortSpecification.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortSpecification.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortSpecification.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SortSpecification.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/StaticValues.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/StaticValues.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/StaticValues.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/StaticValues.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ValueFormatHints.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ValueFormatHints.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ValueFormatHints.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ValueFormatHints.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AndExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AndExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AndExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AndExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AtomicExpressionContextImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AtomicExpressionContextImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AtomicExpressionContextImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AtomicExpressionContextImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CompositeFilterExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CompositeFilterExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CompositeFilterExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CompositeFilterExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomDataImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomDataImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomDataImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomDataImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifierImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifierImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifierImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifierImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifiersImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifiersImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifiersImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementIdentifiersImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetDesignImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetDesignImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetDesignImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetDesignImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignFactoryImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignPackageImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignPackageImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignPackageImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignPackageImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionArgumentsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionArgumentsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionArgumentsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionArgumentsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParameterDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParameterDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParameterDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParameterDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParametersImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParametersImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParametersImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionParametersImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionVariableImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionVariableImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionVariableImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ExpressionVariableImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionTypeImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionTypeImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionTypeImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/FilterExpressionTypeImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementUIHintsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementUIHintsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementUIHintsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputElementUIHintsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NotExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NotExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NotExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NotExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OrExpressionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OrExpressionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OrExpressionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OrExpressionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetCriteriaImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetCriteriaImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetCriteriaImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetCriteriaImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSubsetImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSubsetImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSubsetImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSubsetImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortKeyImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortKeyImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortKeyImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortKeyImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortSpecificationImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortSpecificationImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortSpecificationImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/SortSpecificationImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/StaticValuesImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/StaticValuesImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/StaticValuesImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/StaticValuesImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignAdapterFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignAdapterFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignAdapterFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignAdapterFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceFactoryImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceFactoryImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceFactoryImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceFactoryImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignResourceImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignSwitch.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignSwitch.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignSwitch.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignSwitch.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignValidator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignValidator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignValidator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignValidator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignXMLProcessor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignXMLProcessor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignXMLProcessor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/DesignXMLProcessor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/util/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/fieldlist.ico b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/fieldlist.ico
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/fieldlist.ico
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/fieldlist.ico
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/file.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/file.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/file.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/file.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/profile.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/profile.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/profile.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/icons/profile.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/FlatFileUIPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/FlatFileUIPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/FlatFileUIPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/FlatFileUIPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/i18n/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/IHelpConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/IHelpConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/IHelpConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/IHelpConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/Utility.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/Utility.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/Utility.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/util/Utility.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionPageHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionPageHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionPageHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionPageHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FolderSelectionWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/MenuButton.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/MenuButton.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/MenuButton.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/MenuButton.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/RelativeFileSelectionDialog.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/RelativeFileSelectionDialog.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/RelativeFileSelectionDialog.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/RelativeFileSelectionDialog.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/.options b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.options
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/.options
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.options
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/CommonConstants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/CommonConstants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/CommonConstants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/CommonConstants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/Connection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/Connection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/Connection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/Connection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataTypes.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataTypes.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataTypes.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/DataTypes.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileDriver.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileDriver.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileDriver.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileDriver.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/FlatFileQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/InvalidResourceException.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/InvalidResourceException.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/InvalidResourceException.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/InvalidResourceException.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceInputStream.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceInputStream.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceInputStream.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceInputStream.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceLocator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceLocator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceLocator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResourceLocator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaDataHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaDataHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaDataHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/ResultSetMetaDataHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/i18n/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/plugin/FlatfilePlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/plugin/FlatfilePlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/plugin/FlatfilePlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/plugin/FlatfilePlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatISO8601.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatISO8601.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatISO8601.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateFormatISO8601.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/DateUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/FlatFileDataReader.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/FlatFileDataReader.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/FlatFileDataReader.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/FlatFileDataReader.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/ColumnsInfoUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/ColumnsInfoUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/ColumnsInfoUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/ColumnsInfoUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/QueryTextUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/QueryTextUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/QueryTextUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/QueryTextUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/src/org/eclipse/datatools/connectivity/oda/flatfile/util/querytextutil/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/schema/profileStore.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/schema/profileStore.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/schema/profileStore.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/schema/profileStore.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/Constants.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/Constants.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/Constants.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/Constants.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionWrapper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionWrapper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionWrapper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaConnectionWrapper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfileExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfileExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfileExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfileExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfilePlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfilePlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfilePlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/OdaProfilePlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/ProfileFileExtension.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/ProfileFileExtension.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/ProfileFileExtension.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/ProfileFileExtension.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaConnectionProfile.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaConnectionProfile.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaConnectionProfile.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaConnectionProfile.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaProfileFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaProfileFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaProfileFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/OdaProfileFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/ProfileCategoryUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/ProfileCategoryUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/ProfileCategoryUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/internal/ProfileCategoryUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/provider/ProfilePropertyProviderImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/provider/ProfilePropertyProviderImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/provider/ProfilePropertyProviderImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/src/org/eclipse/datatools/connectivity/oda/profile/provider/ProfilePropertyProviderImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/icons/newoda_wiz.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/icons/newoda_wiz.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/icons/newoda_wiz.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/icons/newoda_wiz.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/icons/newodaui_wiz.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/icons/newodaui_wiz.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/icons/newodaui_wiz.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/icons/newodaui_wiz.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/CompatiblePluginReference.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/CompatiblePluginReference.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/CompatiblePluginReference.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/CompatiblePluginReference.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/DesignTimeTemplateSection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/DesignTimeTemplateSection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/DesignTimeTemplateSection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/DesignTimeTemplateSection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDesignerWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDesignerWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDesignerWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDesignerWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDriverWizard.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDriverWizard.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDriverWizard.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/NewOdaDriverWizard.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaPluginModeler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaPluginModeler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaPluginModeler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaPluginModeler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaTemplateSection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaTemplateSection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaTemplateSection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/OdaTemplateSection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/RuntimeTemplateSection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/RuntimeTemplateSection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/RuntimeTemplateSection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/internal/ui/RuntimeTemplateSection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/plugin/Activator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/plugin/Activator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/plugin/Activator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/src/org/eclipse/datatools/connectivity/oda/template/ui/plugin/Activator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/datasetpage.ico b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/datasetpage.ico
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/datasetpage.ico
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/datasetpage.ico
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/new_oda_dswiz.ico b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/new_oda_dswiz.ico
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/new_oda_dswiz.ico
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/new_oda_dswiz.ico
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/profile.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/profile.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/profile.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/icons/profile.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/java/CustomDataSetWizardPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/java/CustomDataSetWizardPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/java/CustomDataSetWizardPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/java/CustomDataSetWizardPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/designer/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Connection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Connection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Connection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Connection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/DataSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/DataSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/DataSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/DataSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Driver.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Driver.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Driver.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Driver.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ParameterMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ParameterMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ParameterMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ParameterMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Query.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Query.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Query.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/Query.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/java/ResultSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/templates_oda_3.0/runtimeDriver/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/about.ini b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.ini
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/about.ini
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.ini
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/about.mappings b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.mappings
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/about.mappings
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.mappings
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/about.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/about.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/about.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/eclipse32.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/eclipse32.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/eclipse32.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/eclipse32.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/eclipse32.png b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/eclipse32.png
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/eclipse32.png
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/eclipse32.png
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_datasource.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_datasource.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_datasource.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_datasource.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_dynamicResultSet.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_dynamicResultSet.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_dynamicResultSet.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema-doc/org_eclipse_datatools_connectivity_oda_dynamicResultSet.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/schema/datasource.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema/datasource.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/schema/datasource.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema/datasource.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/schema/dynamicResultSet.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema/dynamicResultSet.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/schema/dynamicResultSet.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/schema/dynamicResultSet.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IAdvancedQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IAdvancedQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IAdvancedQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IAdvancedQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IBlob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IBlob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IBlob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IBlob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IClob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IClob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IClob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IClob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IConnection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IConnection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IConnection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IConnection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDataSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDataSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDataSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDataSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDriver.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDriver.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDriver.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IDriver.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterRowSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterRowSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterRowSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IParameterRowSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/IResultSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/LogConfiguration.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/LogConfiguration.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/LogConfiguration.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/LogConfiguration.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/OdaException.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/OdaException.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/OdaException.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/OdaException.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/SortSpec.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/SortSpec.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/SortSpec.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/SortSpec.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Blob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Blob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Blob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Blob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Clob.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Clob.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Clob.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/Clob.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleConnection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleConnection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleConnection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleConnection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDataSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDataSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDataSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDataSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDriver.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDriver.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDriver.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleDriver.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleParameterMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleParameterMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleParameterMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleParameterMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSet.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSet.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSet.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSet.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSetMetaData.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSetMetaData.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSetMetaData.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/SimpleResultSetMetaData.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/impl/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/internal/OdaPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/internal/OdaPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/internal/OdaPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/internal/OdaPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/Messages.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/Messages.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/Messages.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/Messages.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/messages.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/messages.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/messages.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/messages.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/nls/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/AdvancedQuerySpecification.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/AdvancedQuerySpecification.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/AdvancedQuerySpecification.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/AdvancedQuerySpecification.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/BaseQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/BaseQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/BaseQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/BaseQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionArguments.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionArguments.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionArguments.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionArguments.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionVariable.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionVariable.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionVariable.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ExpressionVariable.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/IValidator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/IValidator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/IValidator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/IValidator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/InternalSpecFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/InternalSpecFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/InternalSpecFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/InternalSpecFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/QuerySpecification.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/QuerySpecification.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/QuerySpecification.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/QuerySpecification.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValidationContext.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValidationContext.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValidationContext.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValidationContext.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/ValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/AtomicQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/AtomicQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/AtomicQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/AtomicQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/CombinedQuery.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/CombinedQuery.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/CombinedQuery.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/CombinedQuery.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/basequery/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/ValidatorBaseImpl.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/ValidatorBaseImpl.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/ValidatorBaseImpl.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/ValidatorBaseImpl.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/impl/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/AggregateDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/AggregateDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/AggregateDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/AggregateDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/CombinedExpressionOperatorDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/CombinedExpressionOperatorDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/CombinedExpressionOperatorDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/CombinedExpressionOperatorDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ExtensionContributor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ExtensionContributor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ExtensionContributor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ExtensionContributor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FilterExpressionDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FilterExpressionDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FilterExpressionDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FilterExpressionDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FunctionExpressionDefinition.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FunctionExpressionDefinition.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FunctionExpressionDefinition.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/FunctionExpressionDefinition.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/ResultExtensionUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/SupportedDataSetType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/SupportedDataSetType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/SupportedDataSetType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/SupportedDataSetType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/VariableRestrictions.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/VariableRestrictions.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/VariableRestrictions.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/VariableRestrictions.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/manifest/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/AggregateExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/AggregateExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/AggregateExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/AggregateExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ColumnIdentifier.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ColumnIdentifier.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ColumnIdentifier.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ColumnIdentifier.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/CustomAggregate.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/CustomAggregate.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/CustomAggregate.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/CustomAggregate.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/FilterExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/FilterExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/FilterExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/FilterExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/InternalResultSpecFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/InternalResultSpecFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/InternalResultSpecFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/InternalResultSpecFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultProjection.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultProjection.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultProjection.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultProjection.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultSetSpecification.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultSetSpecification.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultSetSpecification.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/ResultSetSpecification.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/SortSpecification.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/SortSpecification.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/SortSpecification.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/SortSpecification.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AndExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AndExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AndExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AndExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AtomicExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AtomicExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AtomicExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/AtomicExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CompositeExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CompositeExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CompositeExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CompositeExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CustomExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CustomExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CustomExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/CustomExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/InternalFilterFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/InternalFilterFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/InternalFilterFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/InternalFilterFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/NotExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/NotExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/NotExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/NotExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/OrExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/OrExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/OrExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/OrExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/filter/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/result/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ExpressionFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ExpressionFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ExpressionFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ExpressionFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/QuerySpecificationHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/SortSpecMigrator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/SortSpecMigrator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/SortSpecMigrator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/SortSpecMigrator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ValidatorUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ValidatorUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ValidatorUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/ValidatorUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/util/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/AtomicValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/AtomicValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/AtomicValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/AtomicValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/ColumnValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/ColumnValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/ColumnValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/ColumnValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpressionOperator.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpressionOperator.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpressionOperator.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CombinedValueExpressionOperator.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CustomFunction.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CustomFunction.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CustomFunction.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/CustomFunction.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/FunctionValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/FunctionValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/FunctionValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/FunctionValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/InternalValueExprFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/InternalValueExprFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/InternalValueExprFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/InternalValueExprFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/NestedValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/NestedValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/NestedValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/NestedValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/SimpleValueExpression.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/SimpleValueExpression.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/SimpleValueExpression.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/SimpleValueExpression.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/spec/valueexpr/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/ResourceIdentifiers.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/ResourceIdentifiers.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/ResourceIdentifiers.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/ResourceIdentifiers.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/StringSubstitutionUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/StringSubstitutionUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/StringSubstitutionUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/StringSubstitutionUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/FileHandler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/FileHandler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/FileHandler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/FileHandler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Filter.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Filter.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Filter.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Filter.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Handler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Handler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Handler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Handler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Level.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Level.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Level.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Level.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogFormatter.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogFormatter.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogFormatter.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogFormatter.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogManager.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogManager.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogManager.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogManager.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogRecord.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogRecord.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogRecord.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LogRecord.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Logger.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Logger.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Logger.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/Logger.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LoggingErrorHandler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LoggingErrorHandler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LoggingErrorHandler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/LoggingErrorHandler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/SimpleFormatter.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/SimpleFormatter.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/SimpleFormatter.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/SimpleFormatter.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/StreamHandler.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/StreamHandler.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/StreamHandler.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/StreamHandler.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/logging/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ConnectionProfileProperty.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ConnectionProfileProperty.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ConnectionProfileProperty.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ConnectionProfileProperty.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataSetType.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/DataTypeMapping.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ExtensionManifest.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ExtensionManifest.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ExtensionManifest.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ExtensionManifest.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/JavaRuntimeInterface.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/JavaRuntimeInterface.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/JavaRuntimeInterface.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/JavaRuntimeInterface.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestExplorer.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestExplorer.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestExplorer.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestExplorer.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/ManifestUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Property.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Property.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Property.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Property.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/PropertyChoice.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/PropertyChoice.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/PropertyChoice.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/PropertyChoice.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Relationship.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Relationship.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Relationship.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/Relationship.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/RuntimeInterface.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/RuntimeInterface.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/RuntimeInterface.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/RuntimeInterface.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/TraceLogging.java b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/TraceLogging.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/TraceLogging.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/TraceLogging.java
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/manifest/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/package.html b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/package.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/package.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.oda/src/org/eclipse/datatools/connectivity/oda/util/package.html
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.classpath b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.classpath
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.classpath
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.classpath
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.gitignore b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.gitignore
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.gitignore
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.gitignore
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.options b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.options
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.options
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.options
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.project b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.project
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.project
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.project
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.template b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.template
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/.template
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/.template
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/META-INF/MANIFEST.MF b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/META-INF/MANIFEST.MF
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/META-INF/MANIFEST.MF
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/about.html b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/about.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/about.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/about.html
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/build.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/build.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/build.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/build.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/build.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/build.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/build.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/build.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/bookmark.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/bookmark.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/bookmark.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/bookmark.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/cachedConnection.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/cachedConnection.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/cachedConnection.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/cachedConnection.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/closedFolder.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/closedFolder.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/closedFolder.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/closedFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/collapseall.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/collapseall.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/collapseall.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/collapseall.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/columns.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/columns.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/columns.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/columns.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connect.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connect.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connect.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connect.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectcache.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectcache.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectcache.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectcache.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectionFolder.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectionFolder.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectionFolder.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connectionFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection_wiz.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection_wiz.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection_wiz.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/connection_wiz.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/constraint.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/constraint.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/constraint.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/constraint.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/database.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/database.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/database.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/database.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/delete.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/delete.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/delete.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/delete.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency24.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency24.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency24.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependency24.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependencyFolder.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependencyFolder.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependencyFolder.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/dependencyFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/disconnect_server.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/disconnect_server.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/disconnect_server.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/disconnect_server.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.bmp b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.bmp
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.bmp
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.bmp
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/domain.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/edit_server.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/edit_server.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/edit_server.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/edit_server.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_decorate.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_decorate.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_decorate.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_decorate.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.png b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.png
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.png
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/filter_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_decorate.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_decorate.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_decorate.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_decorate.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_rdbcolumn.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_rdbcolumn.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_rdbcolumn.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/fk_rdbcolumn.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_code.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_code.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_code.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_code.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.png b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.png
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.png
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/generate_ddl_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/group.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/group.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/group.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/group.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/index.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/index.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/index.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/index.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading1.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading1.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading1.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading1.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading2.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading2.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading2.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading2.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading3.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading3.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading3.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading3.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading4.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading4.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading4.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/loading4.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/new.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/new.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/new.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/new.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/notNullColumn.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/notNullColumn.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/notNullColumn.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/notNullColumn.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumn.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumn.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumn.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumn.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumnDecoration.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumnDecoration.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumnDecoration.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/nullColumnDecoration.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/package.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/package.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/package.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/package.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/parameter.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/parameter.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/parameter.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/parameter.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkColumn.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkColumn.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkColumn.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkColumn.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pk_decorate.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pk_decorate.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pk_decorate.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pk_decorate.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_decorate.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_decorate.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_decorate.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_decorate.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_rdbcolumn.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_rdbcolumn.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_rdbcolumn.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/pkfk_rdbcolumn.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/primaryKey.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/primaryKey.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/primaryKey.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/primaryKey.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/properties.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/properties.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/properties.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/properties.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/refresh.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/refresh.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/refresh.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/refresh.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/reverse_engr.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/reverse_engr.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/reverse_engr.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/reverse_engr.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/role.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/role.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/role.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/role.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sample.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sample.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sample.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sample.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sampleContents.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sampleContents.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sampleContents.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sampleContents.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save_edit.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save_edit.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save_edit.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/save_edit.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/schema.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/schema.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/schema.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/schema.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/select_table.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/select_table.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/select_table.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/select_table.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sequence.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sequence.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sequence.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/sequence.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/server_explorer.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/server_explorer.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/server_explorer.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/server_explorer.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/stored_procedure.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/stored_procedure.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/stored_procedure.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/stored_procedure.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table24.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table24.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table24.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/table24.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/trigger.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/trigger.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/trigger.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/trigger.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udf.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udf.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udf.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udf.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udt.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udt.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udt.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/udt.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/user.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/user.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/user.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/user.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view24.gif b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view24.gif
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view24.gif
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/icons/view24.gif
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.xml
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.xml
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/plugin.xml
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_elementID.html b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_elementID.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_elementID.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_elementID.html
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_labelService.html b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_labelService.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_labelService.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_labelService.html
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_markerNavigationProvider.html b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_markerNavigationProvider.html
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_markerNavigationProvider.html
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema-doc/org_eclipse_datatools_connectivity_sqm_core_ui_markerNavigationProvider.html
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/addObjectProvider.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/addObjectProvider.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/addObjectProvider.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/addObjectProvider.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/creationInfoProvider.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/creationInfoProvider.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/creationInfoProvider.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/creationInfoProvider.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/elementID.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/elementID.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/elementID.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/elementID.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/filterInformation.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/filterInformation.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/filterInformation.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/filterInformation.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/labelService.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/labelService.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/labelService.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/labelService.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/markerNavigationProvider.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/markerNavigationProvider.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/markerNavigationProvider.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/markerNavigationProvider.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/sorterValidatorProvider.exsd b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/sorterValidatorProvider.exsd
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/schema/sorterValidatorProvider.exsd
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/schema/sorterValidatorProvider.exsd
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/IHelpContextsSQMCoreUI.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/IHelpContextsSQMCoreUI.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/IHelpContextsSQMCoreUI.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/IHelpContextsSQMCoreUI.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/RDBCoreUIPlugin.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/RDBCoreUIPlugin.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/RDBCoreUIPlugin.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/RDBCoreUIPlugin.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/FilterListSelectionDialog.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/FilterListSelectionDialog.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/FilterListSelectionDialog.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/FilterListSelectionDialog.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/ResourceChooserDialog.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/ResourceChooserDialog.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/ResourceChooserDialog.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/dialogs/ResourceChooserDialog.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnCellModifier.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnCellModifier.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnCellModifier.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnCellModifier.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnContentProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnContentProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnContentProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnContentProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnLabelProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnLabelProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnLabelProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnLabelProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnTable.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnTable.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnTable.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ColumnTable.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/CommonTableCursor.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/CommonTableCursor.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/CommonTableCursor.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/CommonTableCursor.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterComposite.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterComposite.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterComposite.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterComposite.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/ConnectionFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultSPFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultSPFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultSPFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultSPFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultTableFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultTableFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultTableFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/DefaultTableFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterNodeFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterNodeFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterNodeFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterNodeFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/FilterUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IConnectionFilterProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IConnectionFilterProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IConnectionFilterProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IConnectionFilterProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IFilterNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IFilterNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IFilterNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/IFilterNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/SchemaFilterPropertyPage.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/SchemaFilterPropertyPage.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/SchemaFilterPropertyPage.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/filter/SchemaFilterPropertyPage.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ColumnHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ColumnHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ColumnHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ColumnHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/FilterHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/FilterHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/FilterHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/FilterHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ForeignKeyHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ForeignKeyHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ForeignKeyHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/ForeignKeyHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/IndexHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/IndexHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/IndexHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/IndexHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/TriggerHelper.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/TriggerHelper.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/TriggerHelper.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/helpers/TriggerHelper.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/AbstractAction.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/AbstractAction.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/AbstractAction.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/AbstractAction.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractActionProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractActionProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractActionProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractActionProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractSubMenuActionProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractSubMenuActionProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractSubMenuActionProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/popup/providers/AbstractSubMenuActionProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/AuthorizationIDNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/AuthorizationIDNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/AuthorizationIDNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/AuthorizationIDNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/CatalogNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/CatalogNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/CatalogNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/CatalogNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ColumnNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ColumnNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ColumnNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ColumnNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ConstraintNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ConstraintNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ConstraintNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ConstraintNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/DependencyNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/DependencyNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/DependencyNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/DependencyNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/GroupNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/GroupNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/GroupNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/GroupNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/IndexNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/IndexNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/IndexNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/IndexNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/RoleNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/RoleNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/RoleNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/RoleNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SchemaNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SchemaNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SchemaNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SchemaNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SequenceNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SequenceNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SequenceNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/SequenceNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/StoredProcedureNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/StoredProcedureNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/StoredProcedureNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/StoredProcedureNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TableNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TableNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TableNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TableNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TriggerNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TriggerNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TriggerNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/TriggerNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDFNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDFNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDFNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDFNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDTNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDTNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDTNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UDTNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UserNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UserNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UserNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/UserNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ViewNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ViewNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ViewNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/ViewNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/VirtualNodeServiceFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/VirtualNodeServiceFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/VirtualNodeServiceFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/content/virtual/VirtualNodeServiceFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IBookmarkDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IBookmarkDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IBookmarkDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IBookmarkDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IColumnDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IColumnDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IColumnDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IColumnDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDependencyDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDependencyDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDependencyDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IDependencyDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IFilterNodeDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IFilterNodeDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IFilterNodeDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IFilterNodeDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IIndexTriggerDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IIndexTriggerDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IIndexTriggerDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/IIndexTriggerDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/AbstractDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/AbstractDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/AbstractDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/AbstractDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/BookmarkDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/BookmarkDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/BookmarkDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/BookmarkDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ColumnDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ColumnDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ColumnDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ColumnDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/DependencyDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/DependencyDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/DependencyDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/DependencyDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/FilterNodeDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/FilterNodeDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/FilterNodeDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/FilterNodeDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ForeignKeyDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ForeignKeyDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ForeignKeyDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/ForeignKeyDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/IndexTriggerDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/IndexTriggerDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/IndexTriggerDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/decorators/impl/IndexTriggerDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/AuthorizationSelector.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/AuthorizationSelector.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/AuthorizationSelector.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/AuthorizationSelector.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/UserSelector.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/UserSelector.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/UserSelector.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/providers/label/UserSelector.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IExplorerInteractionService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IExplorerInteractionService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IExplorerInteractionService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IExplorerInteractionService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IVirtualNodeServiceFactory.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IVirtualNodeServiceFactory.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IVirtualNodeServiceFactory.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/services/IVirtualNodeServiceFactory.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IAuthorizationIDNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IAuthorizationIDNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IAuthorizationIDNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IAuthorizationIDNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ICatalogNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ICatalogNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ICatalogNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ICatalogNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IColumnNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IColumnNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IColumnNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IColumnNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IConstraintNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IConstraintNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IConstraintNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IConstraintNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IDependencyNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IDependencyNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IDependencyNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IDependencyNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupIDNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupIDNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupIDNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupIDNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IGroupNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IIndexNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IIndexNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IIndexNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IIndexNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IKeyNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IKeyNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IKeyNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IKeyNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IRoleNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IRoleNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IRoleNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IRoleNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISchemaNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISchemaNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISchemaNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISchemaNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISequenceNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISequenceNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISequenceNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ISequenceNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IServerManagerNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IServerManagerNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IServerManagerNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IServerManagerNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IStoredProcedureNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IStoredProcedureNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IStoredProcedureNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IStoredProcedureNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITableNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITableNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITableNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITableNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITriggerNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITriggerNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITriggerNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/ITriggerNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDFNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDFNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDFNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDFNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDTNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDTNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDTNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUDTNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUserNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUserNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUserNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IUserNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IViewNode.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IViewNode.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IViewNode.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/explorer/virtual/IViewNode.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/ImageDescription.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/ImageDescription.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/ImageDescription.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/ImageDescription.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/critical.ico b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/critical.ico
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/critical.ico
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/critical.ico
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/databaseToModelWizard.bmp b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/databaseToModelWizard.bmp
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/databaseToModelWizard.bmp
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/databaseToModelWizard.bmp
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/database_32.ico b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/database_32.ico
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/database_32.ico
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/database_32.ico
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/modelToDatabaseWizard.bmp b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/modelToDatabaseWizard.bmp
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/modelToDatabaseWizard.bmp
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/modelToDatabaseWizard.bmp
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/wizardWatermark.bmp b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/wizardWatermark.bmp
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/wizardWatermark.bmp
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/icons/wizardWatermark.bmp
Binary files differ
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/l10n/datatoolsCoreUI.properties b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/l10n/datatoolsCoreUI.properties
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/l10n/datatoolsCoreUI.properties
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/l10n/datatoolsCoreUI.properties
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/ColumnDecoratorUtil.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/ColumnDecoratorUtil.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/ColumnDecoratorUtil.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/ColumnDecoratorUtil.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/LabelDecoratorPreference.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/LabelDecoratorPreference.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/LabelDecoratorPreference.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/LabelDecoratorPreference.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/OutputPreference.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/OutputPreference.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/OutputPreference.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/preferences/OutputPreference.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/DataToolsUIServiceManager.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/DataToolsUIServiceManager.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/DataToolsUIServiceManager.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/DataToolsUIServiceManager.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/ExplorerSorterProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/ExplorerSorterProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/ExplorerSorterProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/ExplorerSorterProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IColumnHelperService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IColumnHelperService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IColumnHelperService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IColumnHelperService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IDecorationService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IDecorationService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IDecorationService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IDecorationService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IElementIDProvider.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IElementIDProvider.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IElementIDProvider.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IElementIDProvider.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IExplorerSorterService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IExplorerSorterService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IExplorerSorterService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IExplorerSorterService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IForeignKeyHelperService.java b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IForeignKeyHelperService.java
similarity index 100%
rename from plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IForeignKeyHelperService.java
rename to plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/IForeignKeyHelperService.java
diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.core.ui/src/org/eclipse/datatools/connectivity/sqm/core/internal/ui/services/ILabelService.java