diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0e27eca15a..84c7b1eb11 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-09-21 18:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  - contrib/hbide/idedbu/*
+  + contrib/hbide/xbpaddons/*
+    - Deleted xbpaddons consumed resources from hbide/resources.
+ 
 2012-09-21 12:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbide.hbp
   * contrib/hbxbp/hbxbp.hbp
diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp
index dcc264394f..094299dbcf 100644
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -23,9 +23,9 @@ hbxbp.hbc
 hbqt.hbc
 hbformat.hbc
 
-idedbu/idedbu.hbp
-idedbu/idedbu.hbc
--Lidedbu
+xbpaddons/xbpaddons.hbp
+xbpaddons/xbpaddons.hbc
+-Lxbpaddons
 
 -env:HB_DYNLOAD_RDDADS=yes
 rddads.hbc
diff --git a/harbour/contrib/hbide/hbide.qrc b/harbour/contrib/hbide/hbide.qrc
index e9f172569d..d21bed3cbe 100644
--- a/harbour/contrib/hbide/hbide.qrc
+++ b/harbour/contrib/hbide/hbide.qrc
@@ -31,29 +31,8 @@
     <file>resources/curlinehilight.png</file>
     <file>resources/cut.png</file>
     <file>resources/cutb16.png</file>
-    <file>resources/database.png</file>
-    <file>resources/database_accept.png</file>
-    <file>resources/database_add.png</file>
-    <file>resources/database_remove.png</file>
-    <file>resources/database_lock.png</file>
-    <file>resources/database_process.png</file>
-    <file>resources/database_up.png</file>
-    <file>resources/database_down.png</file>
-    <file>resources/database_previous.png</file>
-    <file>resources/database_next.png</file>
-    <file>resources/database_search.png</file>
     <file>resources/dbl2sglquote.png</file>
     <file>resources/dbstruct.png</file>
-    <file>resources/dbf_p1.png</file>
-    <file>resources/dbf_p2.png</file>
-    <file>resources/dbf_p3.png</file>
-    <file>resources/dbf_p4.png</file>
-    <file>resources/dbf_p5.png</file>
-    <file>resources/dbf_p6.png</file>
-    <file>resources/dbf_p7.png</file>
-    <file>resources/dbf_p8.png</file>
-    <file>resources/dbf_p9.png</file>
-    <file>resources/dbf_p10.png</file>
     <file>resources/dc_delete.png</file>
     <file>resources/dc_down.png</file>
     <file>resources/dc_folder.png</file>
@@ -233,15 +212,6 @@
     <file>resources/unload_1.png</file>
     <file>resources/up.png</file>
     <file>resources/up16.png</file>
-    <file>resources/view_cascaded.png</file>
-    <file>resources/view_organized.png</file>
-    <file>resources/view_tabbed.png</file>
-    <file>resources/view_tiled.png</file>
-    <file>resources/view_vertstacked.png</file>
-    <file>resources/view_horzstacked.png</file>
-    <file>resources/view_zoomin.png</file>
-    <file>resources/view_zoomout.png</file>
-    <file>resources/view_refresh.png</file>
     <file>resources/vr-16x16.png</file>
     <file>resources/vr.png</file>
     <file>resources/xmate.png</file>
@@ -329,6 +299,15 @@
     <file>resources/launch_r.png</file>
     <file>resources/editor.png</file>
     <file>resources/configtoolbars.png</file>
+    <file>resources/view_cascaded.png</file>
+    <file>resources/view_organized.png</file>
+    <file>resources/view_tabbed.png</file>
+    <file>resources/view_tiled.png</file>
+    <file>resources/view_vertstacked.png</file>
+    <file>resources/view_horzstacked.png</file>
+    <file>resources/view_zoomin.png</file>
+    <file>resources/view_zoomout.png</file>
+    <file>resources/view_refresh.png</file>
     <file>docs/faq.htm</file>
   </qresource>
 </RCC>
diff --git a/harbour/contrib/hbide/resources/database.png b/harbour/contrib/hbide/resources/database.png
deleted file mode 100644
index 09e60ca969..0000000000
Binary files a/harbour/contrib/hbide/resources/database.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_accept.png b/harbour/contrib/hbide/resources/database_accept.png
deleted file mode 100644
index d1c1ea009a..0000000000
Binary files a/harbour/contrib/hbide/resources/database_accept.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_add.png b/harbour/contrib/hbide/resources/database_add.png
deleted file mode 100644
index 56154bd4aa..0000000000
Binary files a/harbour/contrib/hbide/resources/database_add.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_down.png b/harbour/contrib/hbide/resources/database_down.png
deleted file mode 100644
index 45bef4f553..0000000000
Binary files a/harbour/contrib/hbide/resources/database_down.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_lock.png b/harbour/contrib/hbide/resources/database_lock.png
deleted file mode 100644
index 4bf67f58b6..0000000000
Binary files a/harbour/contrib/hbide/resources/database_lock.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_next.png b/harbour/contrib/hbide/resources/database_next.png
deleted file mode 100644
index 2b331161d9..0000000000
Binary files a/harbour/contrib/hbide/resources/database_next.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_previous.png b/harbour/contrib/hbide/resources/database_previous.png
deleted file mode 100644
index 0b82732845..0000000000
Binary files a/harbour/contrib/hbide/resources/database_previous.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_process.png b/harbour/contrib/hbide/resources/database_process.png
deleted file mode 100644
index b32c305585..0000000000
Binary files a/harbour/contrib/hbide/resources/database_process.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_remove.png b/harbour/contrib/hbide/resources/database_remove.png
deleted file mode 100644
index a8d37e00a4..0000000000
Binary files a/harbour/contrib/hbide/resources/database_remove.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_search.png b/harbour/contrib/hbide/resources/database_search.png
deleted file mode 100644
index e8664ac108..0000000000
Binary files a/harbour/contrib/hbide/resources/database_search.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/database_up.png b/harbour/contrib/hbide/resources/database_up.png
deleted file mode 100644
index 23876648c0..0000000000
Binary files a/harbour/contrib/hbide/resources/database_up.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p1.png b/harbour/contrib/hbide/resources/dbf_p1.png
deleted file mode 100644
index 136854204a..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p1.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p10.png b/harbour/contrib/hbide/resources/dbf_p10.png
deleted file mode 100644
index 69ce1f73d8..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p10.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p2.png b/harbour/contrib/hbide/resources/dbf_p2.png
deleted file mode 100644
index 42aa4ea275..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p2.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p3.png b/harbour/contrib/hbide/resources/dbf_p3.png
deleted file mode 100644
index 5038d42245..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p3.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p4.png b/harbour/contrib/hbide/resources/dbf_p4.png
deleted file mode 100644
index 230cfe5e7b..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p4.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p5.png b/harbour/contrib/hbide/resources/dbf_p5.png
deleted file mode 100644
index 100b640307..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p5.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p6.png b/harbour/contrib/hbide/resources/dbf_p6.png
deleted file mode 100644
index 5fe7e8d2d6..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p6.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p7.png b/harbour/contrib/hbide/resources/dbf_p7.png
deleted file mode 100644
index 4ede4fc3d2..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p7.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p8.png b/harbour/contrib/hbide/resources/dbf_p8.png
deleted file mode 100644
index 83fcaebacf..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p8.png and /dev/null differ
diff --git a/harbour/contrib/hbide/resources/dbf_p9.png b/harbour/contrib/hbide/resources/dbf_p9.png
deleted file mode 100644
index a7b2da329d..0000000000
Binary files a/harbour/contrib/hbide/resources/dbf_p9.png and /dev/null differ
diff --git a/harbour/contrib/hbide/idedbu/dbu.prg b/harbour/contrib/hbide/xbpaddons/dbu.prg
similarity index 99%
rename from harbour/contrib/hbide/idedbu/dbu.prg
rename to harbour/contrib/hbide/xbpaddons/dbu.prg
index f8d9873787..6f707757d8 100644
--- a/harbour/contrib/hbide/idedbu/dbu.prg
+++ b/harbour/contrib/hbide/xbpaddons/dbu.prg
@@ -241,7 +241,7 @@ METHOD HbpDBU:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
 
    IF ! ::lRegistered
       ::lRegistered := .T.
-      QResource():registerResource_1( hbqtres_dbu() )
+      QResource():registerResource_1( hbqtres_xbp() )
    ENDIF
 
    ::xbpWindow:init( oParent, oOwner, aPos, aSize, aPresParams, lVisible )
@@ -780,7 +780,7 @@ METHOD HbpDBU:showTablesTree()
    LOCAL oUI, qTree, qParent, oPanel, qItm, aBrowser, q, aFld, qFont, nMax, nSz, oBrw
    LOCAL a_:={}
 
-   oUI := hbqtui_Tables( ::oCurPanel:qWidget )
+   oUI := hbqtui_xbpTables( ::oCurPanel:qWidget )
 
    qFont := QFont( "Courier New", 8 )
    qTree := oUI:treeTables
@@ -912,7 +912,7 @@ METHOD HbpDBU:buildUiStruct()
    LOCAL oTbl, n, qItm
    LOCAL hdr_:= { { "", 50 }, { "Field Name",200 }, { "Type", 100 }, { "Len", 50 }, { "Dec", 70 } }
 
-   ::qStruct := hbqtui_DbStruct( ::oWidget )
+   ::qStruct := hbqtui_xbpDbStruct( ::oWidget )
 
    ::qStruct:setWindowFlags( Qt_Dialog )
    ::qStruct:setMaximumHeight( ::qStruct:height() )
@@ -2823,7 +2823,7 @@ STATIC FUNCTION hbide_fetchADate( qParent, cTitle, cPrompt, dDefault )
    DEFAULT cTitle  TO "A Date Value"
    DEFAULT cPrompt TO "What"
 
-   oUI := hbqtui_FetchDate( qParent )
+   oUI := hbqtui_xbpFetchDate( qParent )
 
    oUI:setWindowTitle( cTitle )
    oUI:labelPrompt:setText( cPrompt )
@@ -2898,6 +2898,6 @@ STATIC FUNCTION hbide_fldType2Desc( cType )
 
 FUNCTION dbu_Image( cName )
 
-   RETURN ":/dbu/resources" + "/" + cName + ".png"
+   RETURN ":/xbp/resources" + "/" + cName + ".png"
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbide/idedbu/resources/closetab.png b/harbour/contrib/hbide/xbpaddons/resources/closetab.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/closetab.png
rename to harbour/contrib/hbide/xbpaddons/resources/closetab.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database.png b/harbour/contrib/hbide/xbpaddons/resources/database.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database.png
rename to harbour/contrib/hbide/xbpaddons/resources/database.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_accept.png b/harbour/contrib/hbide/xbpaddons/resources/database_accept.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_accept.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_accept.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_add.png b/harbour/contrib/hbide/xbpaddons/resources/database_add.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_add.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_add.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_down.png b/harbour/contrib/hbide/xbpaddons/resources/database_down.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_down.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_down.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_lock.png b/harbour/contrib/hbide/xbpaddons/resources/database_lock.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_lock.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_lock.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_next.png b/harbour/contrib/hbide/xbpaddons/resources/database_next.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_next.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_next.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_previous.png b/harbour/contrib/hbide/xbpaddons/resources/database_previous.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_previous.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_previous.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_process.png b/harbour/contrib/hbide/xbpaddons/resources/database_process.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_process.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_process.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_remove.png b/harbour/contrib/hbide/xbpaddons/resources/database_remove.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_remove.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_remove.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_search.png b/harbour/contrib/hbide/xbpaddons/resources/database_search.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_search.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_search.png
diff --git a/harbour/contrib/hbide/idedbu/resources/database_up.png b/harbour/contrib/hbide/xbpaddons/resources/database_up.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/database_up.png
rename to harbour/contrib/hbide/xbpaddons/resources/database_up.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p1.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p1.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p1.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p1.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p10.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p10.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p10.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p10.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p2.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p2.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p2.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p2.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p3.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p3.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p3.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p3.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p4.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p4.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p4.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p4.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p5.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p5.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p5.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p5.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p6.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p6.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p6.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p6.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p7.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p7.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p7.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p7.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p8.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p8.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p8.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p8.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbf_p9.png b/harbour/contrib/hbide/xbpaddons/resources/dbf_p9.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbf_p9.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbf_p9.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dbstruct.png b/harbour/contrib/hbide/xbpaddons/resources/dbstruct.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dbstruct.png
rename to harbour/contrib/hbide/xbpaddons/resources/dbstruct.png
diff --git a/harbour/contrib/hbide/idedbu/resources/dc_delete.png b/harbour/contrib/hbide/xbpaddons/resources/dc_delete.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/dc_delete.png
rename to harbour/contrib/hbide/xbpaddons/resources/dc_delete.png
diff --git a/harbour/contrib/hbide/idedbu/resources/find.png b/harbour/contrib/hbide/xbpaddons/resources/find.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/find.png
rename to harbour/contrib/hbide/xbpaddons/resources/find.png
diff --git a/harbour/contrib/hbide/idedbu/resources/form.png b/harbour/contrib/hbide/xbpaddons/resources/form.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/form.png
rename to harbour/contrib/hbide/xbpaddons/resources/form.png
diff --git a/harbour/contrib/hbide/idedbu/resources/formview.png b/harbour/contrib/hbide/xbpaddons/resources/formview.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/formview.png
rename to harbour/contrib/hbide/xbpaddons/resources/formview.png
diff --git a/harbour/contrib/hbide/idedbu/resources/fullscreen.png b/harbour/contrib/hbide/xbpaddons/resources/fullscreen.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/fullscreen.png
rename to harbour/contrib/hbide/xbpaddons/resources/fullscreen.png
diff --git a/harbour/contrib/hbide/idedbu/resources/gotoline3.png b/harbour/contrib/hbide/xbpaddons/resources/gotoline3.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/gotoline3.png
rename to harbour/contrib/hbide/xbpaddons/resources/gotoline3.png
diff --git a/harbour/contrib/hbide/idedbu/resources/open3.png b/harbour/contrib/hbide/xbpaddons/resources/open3.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/open3.png
rename to harbour/contrib/hbide/xbpaddons/resources/open3.png
diff --git a/harbour/contrib/hbide/idedbu/resources/panel_7.png b/harbour/contrib/hbide/xbpaddons/resources/panel_7.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/panel_7.png
rename to harbour/contrib/hbide/xbpaddons/resources/panel_7.png
diff --git a/harbour/contrib/hbide/idedbu/resources/panel_8.png b/harbour/contrib/hbide/xbpaddons/resources/panel_8.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/panel_8.png
rename to harbour/contrib/hbide/xbpaddons/resources/panel_8.png
diff --git a/harbour/contrib/hbide/idedbu/resources/save3.png b/harbour/contrib/hbide/xbpaddons/resources/save3.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/save3.png
rename to harbour/contrib/hbide/xbpaddons/resources/save3.png
diff --git a/harbour/contrib/hbide/idedbu/resources/sort.png b/harbour/contrib/hbide/xbpaddons/resources/sort.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/sort.png
rename to harbour/contrib/hbide/xbpaddons/resources/sort.png
diff --git a/harbour/contrib/hbide/idedbu/resources/table.png b/harbour/contrib/hbide/xbpaddons/resources/table.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/table.png
rename to harbour/contrib/hbide/xbpaddons/resources/table.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_cascaded.png b/harbour/contrib/hbide/xbpaddons/resources/view_cascaded.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_cascaded.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_cascaded.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_docks.png b/harbour/contrib/hbide/xbpaddons/resources/view_docks.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_docks.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_docks.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_horzstacked.png b/harbour/contrib/hbide/xbpaddons/resources/view_horzstacked.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_horzstacked.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_horzstacked.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_organized.png b/harbour/contrib/hbide/xbpaddons/resources/view_organized.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_organized.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_organized.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_refresh.png b/harbour/contrib/hbide/xbpaddons/resources/view_refresh.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_refresh.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_refresh.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_tabbed.png b/harbour/contrib/hbide/xbpaddons/resources/view_tabbed.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_tabbed.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_tabbed.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_tiled.png b/harbour/contrib/hbide/xbpaddons/resources/view_tiled.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_tiled.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_tiled.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_vertstacked.png b/harbour/contrib/hbide/xbpaddons/resources/view_vertstacked.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_vertstacked.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_vertstacked.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_zoomin.png b/harbour/contrib/hbide/xbpaddons/resources/view_zoomin.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_zoomin.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_zoomin.png
diff --git a/harbour/contrib/hbide/idedbu/resources/view_zoomout.png b/harbour/contrib/hbide/xbpaddons/resources/view_zoomout.png
similarity index 100%
rename from harbour/contrib/hbide/idedbu/resources/view_zoomout.png
rename to harbour/contrib/hbide/xbpaddons/resources/view_zoomout.png
diff --git a/harbour/contrib/hbide/idedbu/dbu.qrc b/harbour/contrib/hbide/xbpaddons/xbp.qrc
similarity index 98%
rename from harbour/contrib/hbide/idedbu/dbu.qrc
rename to harbour/contrib/hbide/xbpaddons/xbp.qrc
index 92c850671b..023aaa3796 100644
--- a/harbour/contrib/hbide/idedbu/dbu.qrc
+++ b/harbour/contrib/hbide/xbpaddons/xbp.qrc
@@ -1,5 +1,5 @@
 <RCC>
-  <qresource prefix="dbu">
+  <qresource prefix="xbp">
     <file>resources/view_cascaded.png</file>
     <file>resources/view_organized.png</file>
     <file>resources/view_tabbed.png</file>
diff --git a/harbour/contrib/hbide/idedbu/idedbu.hbc b/harbour/contrib/hbide/xbpaddons/xbpaddons.hbc
similarity index 100%
rename from harbour/contrib/hbide/idedbu/idedbu.hbc
rename to harbour/contrib/hbide/xbpaddons/xbpaddons.hbc
diff --git a/harbour/contrib/hbide/idedbu/idedbu.hbp b/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
similarity index 55%
rename from harbour/contrib/hbide/idedbu/idedbu.hbp
rename to harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
index a80ab83ef7..ee185f7f1b 100644
--- a/harbour/contrib/hbide/idedbu/idedbu.hbp
+++ b/harbour/contrib/hbide/xbpaddons/xbpaddons.hbp
@@ -12,7 +12,9 @@
 hbxbp.hbc
 
 dbu.prg
-dbu.qrc
-dbstruct.ui
-fetchdate.ui
-tables.ui
+
+xbp.qrc
+
+xbpdbstruct.ui
+xbpfetchdate.ui
+xbptables.ui
diff --git a/harbour/contrib/hbide/idedbu/dbstruct.ui b/harbour/contrib/hbide/xbpaddons/xbpdbstruct.ui
similarity index 100%
rename from harbour/contrib/hbide/idedbu/dbstruct.ui
rename to harbour/contrib/hbide/xbpaddons/xbpdbstruct.ui
diff --git a/harbour/contrib/hbide/idedbu/fetchdate.ui b/harbour/contrib/hbide/xbpaddons/xbpfetchdate.ui
similarity index 100%
rename from harbour/contrib/hbide/idedbu/fetchdate.ui
rename to harbour/contrib/hbide/xbpaddons/xbpfetchdate.ui
diff --git a/harbour/contrib/hbide/idedbu/tables.ui b/harbour/contrib/hbide/xbpaddons/xbptables.ui
similarity index 100%
rename from harbour/contrib/hbide/idedbu/tables.ui
rename to harbour/contrib/hbide/xbpaddons/xbptables.ui