diff --git a/bundles/org.jkiss.dbeaver.debug.core/.classpath b/plugins/org.jkiss.dbeaver.debug.core/.classpath
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/.classpath
rename to plugins/org.jkiss.dbeaver.debug.core/.classpath
diff --git a/bundles/org.jkiss.dbeaver.debug.core/.project b/plugins/org.jkiss.dbeaver.debug.core/.project
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/.project
rename to plugins/org.jkiss.dbeaver.debug.core/.project
diff --git a/bundles/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
rename to plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
diff --git a/bundles/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties
rename to plugins/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.core/build.properties b/plugins/org.jkiss.dbeaver.debug.core/build.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/build.properties
rename to plugins/org.jkiss.dbeaver.debug.core/build.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.core/plugin.xml b/plugins/org.jkiss.dbeaver.debug.core/plugin.xml
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/plugin.xml
rename to plugins/org.jkiss.dbeaver.debug.core/plugin.xml
diff --git a/bundles/org.jkiss.dbeaver.debug.core/pom.xml b/plugins/org.jkiss.dbeaver.debug.core/pom.xml
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/pom.xml
rename to plugins/org.jkiss.dbeaver.debug.core/pom.xml
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugCore.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugCore.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugCore.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugCore.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugEvents.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugEvents.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugEvents.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/DebugEvents.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseBreakpoint.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseBreakpoint.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseBreakpoint.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseBreakpoint.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugController.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugController.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugController.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugController.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugElement.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugElement.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugElement.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugElement.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugTarget.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugTarget.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugTarget.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseDebugTarget.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLaunchDelegate.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLineBreakpoint.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLineBreakpoint.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLineBreakpoint.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseLineBreakpoint.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseProcess.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseProcess.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseProcess.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseProcess.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseThread.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseThread.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseThread.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/DatabaseThread.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseBreakpoint.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseBreakpoint.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseBreakpoint.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseBreakpoint.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugController.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugController.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugController.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugController.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugTarget.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugTarget.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugTarget.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseDebugTarget.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseLineBreakpoint.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseLineBreakpoint.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseLineBreakpoint.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/core/model/IDatabaseLineBreakpoint.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.java b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.java
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.java
diff --git a/bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.properties b/plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.properties
rename to plugins/org.jkiss.dbeaver.debug.core/src/org/jkiss/dbeaver/debug/internal/core/DebugCoreMessages.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/.classpath b/plugins/org.jkiss.dbeaver.debug.ui/.classpath
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/.classpath
rename to plugins/org.jkiss.dbeaver.debug.ui/.classpath
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/.project b/plugins/org.jkiss.dbeaver.debug.ui/.project
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/.project
rename to plugins/org.jkiss.dbeaver.debug.ui/.project
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
rename to plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/build.properties b/plugins/org.jkiss.dbeaver.debug.ui/build.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/build.properties
rename to plugins/org.jkiss.dbeaver.debug.ui/build.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/plugin.xml b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/plugin.xml
rename to plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/pom.xml b/plugins/org.jkiss.dbeaver.debug.ui/pom.xml
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/pom.xml
rename to plugins/org.jkiss.dbeaver.debug.ui/pom.xml
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiInternals.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiInternals.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiInternals.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiInternals.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugModelPresentation.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugModelPresentation.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugModelPresentation.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseDebugModelPresentation.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseTab.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseTab.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseTab.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DatabaseTab.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DebugUi.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DebugUi.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DebugUi.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/DebugUi.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionFactory.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchContributionItem.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/LaunchShortcut.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleSqlBreakpointTarget.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleSqlBreakpointTarget.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleSqlBreakpointTarget.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleSqlBreakpointTarget.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseBreakpointEditor.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseBreakpointEditor.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseBreakpointEditor.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseBreakpointEditor.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailEditor.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailEditor.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailEditor.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailEditor.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailPane.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailPane.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailPane.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDebugDetailPane.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDetailPaneFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDetailPaneFactory.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDetailPaneFactory.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseDetailPaneFactory.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseStandardBreakpointPane.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseStandardBreakpointPane.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseStandardBreakpointPane.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/details/DatabaseStandardBreakpointPane.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/ActionBars.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/ActionBars.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/ActionBars.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/ActionBars.java
diff --git a/bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/Widgets.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/Widgets.java
similarity index 100%
rename from bundles/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/Widgets.java
rename to plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/runtime/ui/Widgets.java
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/.classpath b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.classpath
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/.classpath
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.classpath
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/.project b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.project
similarity index 91%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/.project
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.project
index 5b40fa02a55ae83e7ce603d2a954f3bb58828abc..7ca5dc575704aec7abc0f281ae2ad7ef88c351e5 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/.project
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.jkiss.dbeaver.postgresql.debug.ui</name>
+	<name>org.jkiss.dbeaver.ext.postgresql.debug.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
similarity index 66%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/META-INF/MANIFEST.MF
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
index e83b975fba3a5e3d96e9f2b5065f5a25d4d3ffd5..6f3b565cdc2fdade5ea04b1c31602261d8b4ebb7 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.jkiss.dbeaver.postgresql.debug.core;singleton:=true
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql.debug.core;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.debug.core,
  org.jkiss.dbeaver.ext.postgresql
-Export-Package: org.jkiss.dbeaver.postgresql.debug.core
+Export-Package: org.jkiss.dbeaver.ext.postgresql.debug.core
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/OSGI-INF/l10n/bundle.properties
similarity index 94%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/OSGI-INF/l10n/bundle.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/OSGI-INF/l10n/bundle.properties
index 2cc3983e5d4a50ab200739ae12893f393d4d7f1e..efd36ba42b84c7b4cdb85fd630ddc47602cf126d 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-#Properties file for org.jkiss.dbeaver.postgresql.debug.core
+#Properties file for org.jkiss.dbeaver.ext.postgresql.debug.core
 
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/build.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/build.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/build.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/build.properties
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/plugin.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml
similarity index 88%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/plugin.xml
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml
index 5eb5cd9660ccb54ed67ddae211c7c9b5adaef615..55405b56ffe095028791c9bdeea1eb6906aa4dc5 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/plugin.xml
@@ -22,10 +22,10 @@
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="org.jkiss.dbeaver.postgresql.internal.debug.core.model.PgSqlLaunchDelegate"
+            delegate="org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model.PgSqlLaunchDelegate"
             delegateDescription="%launchConfigurationTypes.launchConfigurationType.pgSQL.delegateDescription"
             delegateName="%launchConfigurationTypes.launchConfigurationType.pgSQL.delegateName"
-            id="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"
             modes="debug"
             name="%launchConfigurationTypes.launchConfigurationType.pgSQL.name">
       </launchConfigurationType>
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/pom.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
similarity index 88%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/pom.xml
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
index 490e289aacb80e87cb1f95adac437c5b1028acc6..580621c9613a89e1567fbc40813d4ff89d5fbe1d 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.postgresql.debug.ui</artifactId>
+  <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.core</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/debug/core/PostgreSqlDebugCore.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/core/PostgreSqlDebugCore.java
similarity index 95%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/debug/core/PostgreSqlDebugCore.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/core/PostgreSqlDebugCore.java
index 1d835c828ebe4e8287673e6147241e05c6c05460..b0e0018da90754a5e9106c182c0b4ee486f1a50b 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/debug/core/PostgreSqlDebugCore.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/debug/core/PostgreSqlDebugCore.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.debug.core;
+package org.jkiss.dbeaver.ext.postgresql.debug.core;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.runtime.CoreException;
@@ -27,17 +27,17 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.debug.core.DebugCore;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDataSource;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreDatabase;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreProcedure;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreSchema;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PostgreSqlDebugCore {
     
-    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.postgresql.debug.core"; //$NON-NLS-1$
+    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.ext.postgresql.debug.core"; //$NON-NLS-1$
     
     public static final String MODEL_IDENTIFIER = BUNDLE_SYMBOLIC_NAME;
 
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java
similarity index 91%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java
index c19858b1475c24ad9a8e961145d86f74a06a9888..572628baa1b9d28d0c5d40a01a45c876e756b200 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.java
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core;
 
 import org.eclipse.osgi.util.NLS;
 
 public class PostgreSqlDebugCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages"; //$NON-NLS-1$
     public static String PgSqlDebugController_connection_application_name;
     public static String PgSqlDebugController_e_failed_session_close;
     public static String PgSqlDebugController_e_failed_session_open;
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/PostgreSqlDebugCoreMessages.properties
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugController.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugController.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugController.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugController.java
index dbef5392f07ef41ed68a840c781a98b1cabd34e1..a255fa7824028427cec2a7e8be997ba48852239f 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugController.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugController.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import java.sql.SQLException;
 import java.util.Map;
@@ -23,6 +23,7 @@ import java.util.Map;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.debug.core.model.DatabaseDebugController;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.exec.DBCResultSet;
 import org.jkiss.dbeaver.model.exec.DBCSession;
@@ -30,7 +31,6 @@ import org.jkiss.dbeaver.model.exec.DBCStatementType;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession;
 import org.jkiss.dbeaver.model.exec.jdbc.JDBCStatement;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlDebugController extends DatabaseDebugController {
     
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugTarget.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugTarget.java
similarity index 88%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugTarget.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugTarget.java
index 02e4b4d17766e59d929426d1e5ecbdff9fdd4cdc..f04a12808d293e21b6f18f7e51ae7a2a85dd8bc5 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlDebugTarget.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlDebugTarget.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunch;
@@ -23,8 +23,8 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IProcess;
 import org.jkiss.dbeaver.debug.core.model.DatabaseDebugTarget;
 import org.jkiss.dbeaver.debug.core.model.DatabaseThread;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlDebugTarget extends DatabaseDebugTarget<PgSqlDebugController> {
     
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java
index 95256c6b2dc2c8c26c32679ccbe7fb00fb53410b..67eb7e9f02a20466a7dcb84bdf6597bec2753205 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlLaunchDelegate.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import java.util.Map;
 
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlThread.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlThread.java
similarity index 89%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlThread.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlThread.java
index a63e92329e08f2a4fc2d2ce0d0f2bfab2b51fa68..c0ef453d511201cabc5be03fc5355ee528bc6a79 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/internal/debug/core/model/PgSqlThread.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/core/model/PgSqlThread.java
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.core.model;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.core.model;
 
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.osgi.util.NLS;
 import org.jkiss.dbeaver.debug.core.model.DatabaseThread;
 import org.jkiss.dbeaver.debug.core.model.IDatabaseDebugTarget;
-import org.jkiss.dbeaver.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
+import org.jkiss.dbeaver.ext.postgresql.internal.debug.core.PostgreSqlDebugCoreMessages;
 
 public class PgSqlThread extends DatabaseThread {
     
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Breakpoint.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Breakpoint.java
similarity index 76%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Breakpoint.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Breakpoint.java
index 9845a269fe797475a33617d513929eb17a110298..5de806d123d4a8ba8c1480d6c6831ceb205a632b 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Breakpoint.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Breakpoint.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface Breakpoint {
 	
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugException.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugException.java
similarity index 95%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugException.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugException.java
index 227adc10083f0e48a4fd5935a88528fba0a66c38..57a1f431fdd3bf1e4cb681cadd68b0fcb929b52c 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugException.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 
 @SuppressWarnings("serial")
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugObject.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugObject.java
similarity index 63%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugObject.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugObject.java
index 5a35c3e23036fbf7faa1c7e513087d8f2d6d47b8..c97dcf1d08e05a200a6fc386af575c65bce63848 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugObject.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugObject.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface DebugObject<OBJECTID> {
 	
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugSession.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugSession.java
similarity index 92%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugSession.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugSession.java
index d7c253c610dce44741554d38099a8165a86246ec..b46b7ff6596ddf703d491eb4e7057a8af5310d87 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/DebugSession.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/DebugSession.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 import java.util.List;
 
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/SessionInfo.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/SessionInfo.java
similarity index 67%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/SessionInfo.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/SessionInfo.java
index 19ed0981485e99b3b0a3a80f42be46b519aa595b..2468d9844e40e307fdca717f296ab9a896cbd146 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/SessionInfo.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/SessionInfo.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface SessionInfo<SESSIONID> {
 	
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/StackFrame.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/StackFrame.java
similarity index 52%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/StackFrame.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/StackFrame.java
index 7449b2164656114abb5664305d61d45fac22bfe9..e1494f825d85dd0f4c43fdfc854b4f43225192c7 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/StackFrame.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/StackFrame.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface StackFrame {
    String getName();
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Variable.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Variable.java
similarity index 66%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Variable.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Variable.java
index 8a188b418b71d86539cc5fa8b5c56668012870e6..538c92df1224baeeaf6a046d4f2529931fc1ddb1 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/Variable.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/Variable.java
@@ -1,4 +1,4 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public interface Variable<T> {
 	
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/VariableType.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/VariableType.java
similarity index 53%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/VariableType.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/VariableType.java
index e226ff00d667a1622b243d3a5b72ee864efeb59e..0fbed834097983acfc5eaa2dedf0ae4dc122ffc1 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/VariableType.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/VariableType.java
@@ -1,3 +1,3 @@
-package org.jkiss.dbeaver.postgresql.pldbg;
+package org.jkiss.dbeaver.ext.postgresql.pldbg;
 
 public enum VariableType { NUMBER, TEXT, DATE, BLOB }
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/console/Debugger.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/console/Debugger.java
similarity index 93%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/console/Debugger.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/console/Debugger.java
index ab533035b19a6c2775e3ed3523b951eba61be52d..12628a716787b941fe3f973ace8748206007b864 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/console/Debugger.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/console/Debugger.java
@@ -1,14 +1,14 @@
-package org.jkiss.dbeaver.postgresql.pldbg.console;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.console;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Scanner;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.DebugManagerPostgres;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.DebugObjectPostgres;
-import org.jkiss.dbeaver.postgresql.pldbg.impl.SessionInfoPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.DebugManagerPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.DebugObjectPostgres;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.impl.SessionInfoPostgres;
 
 @SuppressWarnings("nls")
 public class Debugger {
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/control/DebugManager.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/control/DebugManager.java
similarity index 81%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/control/DebugManager.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/control/DebugManager.java
index 199b35c83265d8cb5b659dd26c0be24bb075371f..131003c26de48d5c4c2732c135606b4a420e95fa 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/control/DebugManager.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/control/DebugManager.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.control;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.control;
 
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugObject;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.SessionInfo;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugObject;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.SessionInfo;
 
 public interface DebugManager<SESSIONID,OBJECTID> {
     SESSIONID getCurrent() throws DebugException;
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugManagerPostgres.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugManagerPostgres.java
similarity index 94%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugManagerPostgres.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugManagerPostgres.java
index 9c0f19a48077334298de73fe79e0ac82becf6401..4f07f4d84cfe4e55cc4204251f327155ab747532 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugManagerPostgres.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugManagerPostgres.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -24,9 +24,9 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.control.DebugManager;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.control.DebugManager;
 
 /**
  * @author Andrey.Hitrin
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugObjectPostgres.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugObjectPostgres.java
similarity index 93%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugObjectPostgres.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugObjectPostgres.java
index 036a8737249d116c1f506e9516e063c403bd0e5e..2d307be89333d16c0fafbaead2f2b434d103fd11 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugObjectPostgres.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugObjectPostgres.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
-import org.jkiss.dbeaver.postgresql.pldbg.DebugObject;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugObject;
 
 /**
  * @author Andrey.Hitrin
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugSessionPostgres.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugSessionPostgres.java
similarity index 92%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugSessionPostgres.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugSessionPostgres.java
index e2e9d744cfe00845859637fb1b934a407410dfa4..63ecf78d831bfe0f480e752df2b6ea7a0739e722 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/DebugSessionPostgres.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/DebugSessionPostgres.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -23,11 +23,11 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jkiss.dbeaver.postgresql.pldbg.Breakpoint;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugSession;
-import org.jkiss.dbeaver.postgresql.pldbg.StackFrame;
-import org.jkiss.dbeaver.postgresql.pldbg.Variable;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Breakpoint;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugSession;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.StackFrame;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Variable;
 
 /**
  * @author Andrey.Hitrin
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/PostgresBreakpoint.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/PostgresBreakpoint.java
similarity index 93%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/PostgresBreakpoint.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/PostgresBreakpoint.java
index 68cd834652d819c0b068fcb3490366f3ceff4fde..eba4e15d67c0d3e82ffba39540345fdb90c58a81 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/PostgresBreakpoint.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/PostgresBreakpoint.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.jkiss.dbeaver.postgresql.pldbg.Breakpoint;
-import org.jkiss.dbeaver.postgresql.pldbg.DebugException;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.Breakpoint;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.DebugException;
 
 
 /**
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/SessionInfoPostgres.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/SessionInfoPostgres.java
similarity index 93%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/SessionInfoPostgres.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/SessionInfoPostgres.java
index 2c4580488c5f90d8fb247136777f280ecf9ba04f..c1e1f25237408ff833b8f99716449652c5c9841b 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/src/org/jkiss/dbeaver/postgresql/pldbg/impl/SessionInfoPostgres.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/src/org/jkiss/dbeaver/ext/postgresql/pldbg/impl/SessionInfoPostgres.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.postgresql.pldbg.impl;
+package org.jkiss.dbeaver.ext.postgresql.pldbg.impl;
 
-import org.jkiss.dbeaver.postgresql.pldbg.SessionInfo;
+import org.jkiss.dbeaver.ext.postgresql.pldbg.SessionInfo;
 
 /**
  * @author Andrey.Hitrin
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/.classpath b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.classpath
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/.classpath
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.classpath
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/.project b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.project
similarity index 91%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/.project
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.project
index b0bf1a87b6c1c16756a5c2abd8c3b7a41696abbf..ec8fcd6339cc6542b39a58adb94ebef21e95b9f9 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/.project
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.jkiss.dbeaver.postgresql.debug.core</name>
+	<name>org.jkiss.dbeaver.ext.postgresql.debug.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
similarity index 73%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/META-INF/MANIFEST.MF
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
index 780729401f67860de09faee5ff10df617abab0dd..ef382059e8743d6fe6d204365037c6ed9e95108d 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.jkiss.dbeaver.postgresql.debug.ui;singleton:=true
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.postgresql.debug.ui;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.debug.core,
  org.jkiss.dbeaver.debug.ui,
  org.jkiss.dbeaver.ext.postgresql,
- org.jkiss.dbeaver.postgresql.debug.core
+ org.jkiss.dbeaver.ext.postgresql.debug.core
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties
similarity index 94%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties
index 833daea37fb132ddc91323268268de010a572314..9ffe3421b1208f623df2dc2924d0fa7e6057c77c 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-#Properties file for org.jkiss.dbeaver.postgresql.debug.ui
+#Properties file for org.jkiss.dbeaver.ext.postgresql.debug.ui
 
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/build.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/build.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/build.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/build.properties
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/plugin.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/plugin.xml
similarity index 75%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/plugin.xml
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/plugin.xml
index 7bc2761789def8576f9140537e9e1e7a29120093..0102e71dcc437073d4207c9d62552b4d1e28a136 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/plugin.xml
@@ -21,18 +21,18 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            configTypeID="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"
+            configTypeID="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"
             icon="platform:/plugin/org.jkiss.dbeaver.ext.postgresql/$nl$/icons/postgresql_icon.png"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchConfigurationTypeImages.launchConfigurationTypeImage.pgSQL">
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchConfigurationTypeImages.launchConfigurationTypeImage.pgSQL">
       </launchConfigurationTypeImage>
    </extension>
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlLaunchConfigurationTabGroup"
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlLaunchConfigurationTabGroup"
             description="%launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL.description"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL"
-            type="org.jkiss.dbeaver.postgresql.debug.core.pgSQL">
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchConfigurationTabGroups.launchConfigurationTabGroup.pgSQL"
+            type="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL">
          <launchMode
                description="%launchConfigurationTabGroups.launchConfigurationTabGroup.launchMode.pgSQL.debug.description"
                mode="debug">
@@ -42,14 +42,14 @@
    <extension
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlLaunchShortcut"
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlLaunchShortcut"
             description="%launchShortcuts.shortcut.pgSQL.description"
             icon="platform:/plugin/org.jkiss.dbeaver.ext.postgresql/$nl$/icons/postgresql_icon.png"
-            id="org.jkiss.dbeaver.postgresql.debug.ui.launchShortcuts.shortcut.pgSQL"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.ui.launchShortcuts.shortcut.pgSQL"
             label="%launchShortcuts.shortcut.pgSQL.label"
             modes="debug">
          <configurationType
-               id="org.jkiss.dbeaver.postgresql.debug.core.pgSQL"></configurationType>
+               id="org.jkiss.dbeaver.ext.postgresql.debug.core.pgSQL"></configurationType>
          <contextualLaunch>
             <contextLabel
                   label="%launchShortcuts.shortcut.pgSQL.label"
@@ -77,8 +77,8 @@
    <extension
          point="org.eclipse.debug.ui.debugModelPresentations">
       <debugModelPresentation
-            class="org.jkiss.dbeaver.postgresql.internal.debug.ui.PgSqlDebugModelPresentation"
-            id="org.jkiss.dbeaver.postgresql.debug.core">
+            class="org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PgSqlDebugModelPresentation"
+            id="org.jkiss.dbeaver.ext.postgresql.debug.core">
       </debugModelPresentation>
    </extension>
 
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.core/pom.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
similarity index 88%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.core/pom.xml
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
index 9a113c4139a65be128dfdf7565dd6acb0c37b79c..b980b2a9467e7bc7899e365e728d074341bf124f 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.core/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
@@ -8,7 +8,7 @@
     <version>1.0.0</version>
     <relativePath>../../</relativePath>
   </parent>
-  <artifactId>org.jkiss.dbeaver.postgresql.debug.core</artifactId>
+  <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.ui</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/debug/ui/PostgreSqlDebugUi.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/PostgreSqlDebugUi.java
similarity index 89%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/debug/ui/PostgreSqlDebugUi.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/PostgreSqlDebugUi.java
index ef0b31dbca6a7e22d097b4de3c44fbf8f370723b..61ee39a623e06b28193799e2fd6639b9e85d7ea3 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/debug/ui/PostgreSqlDebugUi.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/debug/ui/PostgreSqlDebugUi.java
@@ -15,10 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.debug.ui;
 
 public class PostgreSqlDebugUi {
 
-    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.postgresql.debug.ui"; //$NON-NLS-1$
+    public static final String BUNDLE_SYMBOLIC_NAME = "org.jkiss.dbeaver.ext.postgresql.debug.ui"; //$NON-NLS-1$
 
 }
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java
index 51f63b637588c4bd7f3331ccb90e1895d85acce6..c5f272fcdc19216eefb7862a4693ddf009c9241f 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlDebugModelPresentation.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.ui.IValueDetailListener;
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java
index 70bcfce99243a17bd46e0bfa12dc11df91b768bc..9ac4dd092415f46a86f71a656a123fe27b8eecc2 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchConfigurationTabGroup.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java
index 028b96d8535a9541b482351b703838176ca180b8..ddb7cc501fa31a9c0508e756c88039c49d766041 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlLaunchShortcut.java
@@ -15,16 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.jkiss.dbeaver.debug.core.DebugCore;
 import org.jkiss.dbeaver.debug.ui.LaunchShortcut;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
 import org.jkiss.dbeaver.ext.postgresql.model.PostgreProcedure;
 import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
 
 public class PgSqlLaunchShortcut extends LaunchShortcut {
 
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlTab.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlTab.java
similarity index 96%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlTab.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlTab.java
index 11929134fe5dc07f8438488fa031620d6076c8c1..c867f6f08afb427fba79f84c67640c6663e93b8b 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PgSqlTab.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PgSqlTab.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Text;
 import org.jkiss.dbeaver.debug.ui.DatabaseTab;
 import org.jkiss.dbeaver.ext.postgresql.PostgreActivator;
-import org.jkiss.dbeaver.postgresql.debug.core.PostgreSqlDebugCore;
+import org.jkiss.dbeaver.ext.postgresql.debug.core.PostgreSqlDebugCore;
 import org.jkiss.dbeaver.ui.UIUtils;
 
 public class PgSqlTab extends DatabaseTab {
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java
similarity index 91%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java
index 88888a687633187a068e6d0e620b8cd7dd1d5906..c9510680fe7289d2d974142624162bd628bfdffa 100644
--- a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.java
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jkiss.dbeaver.postgresql.internal.debug.ui;
+package org.jkiss.dbeaver.ext.postgresql.internal.debug.ui;
 
 import org.eclipse.osgi.util.NLS;
 
 public class PostgreSqlDebugUiMessages extends NLS {
 
-    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.postgresql.internal.debug.ui.PostgreSqlDebugUiMessages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.postgresql.internal.debug.ui.PostgreSqlDebugUiMessages"; //$NON-NLS-1$
     
     public static String PgSqlLaunchShortcut_e_editor_empty;
     public static String PgSqlLaunchShortcut_e_selection_empty;
diff --git a/bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.properties b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.properties
similarity index 100%
rename from bundles/org.jkiss.dbeaver.postgresql.debug.ui/src/org/jkiss/dbeaver/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.properties
rename to plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/src/org/jkiss/dbeaver/ext/postgresql/internal/debug/ui/PostgreSqlDebugUiMessages.properties
diff --git a/pom.xml b/pom.xml
index 4ee5da30f3a1e2b84aab69ea7e0e2be8a12335a5..d182655baef6b1e87472b28c2d3ede72e8a7283d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
         <module>plugins/org.jkiss.dbeaver.core</module>
         <module>plugins/org.jkiss.dbeaver.ui</module>
 
-        <module>bundles/org.jkiss.dbeaver.debug.core</module>
-        <module>bundles/org.jkiss.dbeaver.debug.ui</module>
+        <module>plugins/org.jkiss.dbeaver.debug.core</module>
+        <module>plugins/org.jkiss.dbeaver.debug.ui</module>
 
         <module>plugins/org.jkiss.dbeaver.core.application</module>
         <module>plugins/org.jkiss.dbeaver.core.eclipse</module>
@@ -51,8 +51,8 @@
         <module>plugins/org.jkiss.dbeaver.ext.phoenix</module>
 
         <module>plugins/org.jkiss.dbeaver.ext.postgresql</module>
-        <module>bundles/org.jkiss.dbeaver.postgresql.debug.core</module>
-        <module>bundles/org.jkiss.dbeaver.postgresql.debug.ui</module>
+        <module>plugins/org.jkiss.dbeaver.ext.postgresql.debug.core</module>
+        <module>plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui</module>
 
         <module>plugins/org.jkiss.dbeaver.ext.sqlite</module>
         <module>plugins/org.jkiss.dbeaver.ext.vertica</module>