diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a60e48231c..603cef0e06 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,35 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-24 10:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/Makefile
+  * contrib/rddsql/Makefile
+  - contrib/rddsql/sddmy
+  + contrib/sddmy
+  * contrib/sddmy/Makefile
+  * contrib/sddmy/sddmy.hbc
+  - contrib/rddsql/sddfb
+  + contrib/sddfb
+  * contrib/sddfb/Makefile
+  * contrib/sddfb/sddfb.hbc
+  - contrib/rddsql/sddpg
+  + contrib/sddpg
+  * contrib/sddpg/Makefile
+  * contrib/sddpg/sddpg.hbc
+  - contrib/rddsql/sddsqlt3
+  + contrib/sddsqlt3
+  * contrib/sddsqlt3/Makefile
+  * contrib/sddsqlt3/sddsqlt3.hbc
+  - contrib/rddsql/sddoci
+  + contrib/sddoci
+  * contrib/sddoci/sddoci.hbc
+  * contrib/sddoci/Makefile
+    * Flattened dir structure.
+
+  * contrib/sddfb/sddfb.c
+  * contrib/sddsqlt3/sddsqlt3.c
+    * Minor formatting.
+
 2010-03-23 15:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbxvm.h
   * harbour/src/vm/hvm.c
@@ -47,13 +76,13 @@
   * harbour/contrib/rddsql/sddpg/sddpg.c
   * harbour/contrib/rddsql/sddsqlt3/sddsqlt3.c
     * moved SDD backed specific data from SQLCONNECTION and SQLAREA
-      to a separate SDDCONN and SDDDATA structures. This helps to 
-      avoid fake type casting and warinings like "break 
+      to a separate SDDCONN and SDDDATA structures. This helps to
+      avoid fake type casting and warinings like "break
       strict-aliasing rules".
     * 1 -> HB_TRUE
     * formatting, style
-    ! connection array is now array of connection pointers. This 
-      fixes GPF if many connections are created and connection 
+    ! connection array is now array of connection pointers. This
+      fixes GPF if many connections are created and connection
       table has to be reallocated
 
 2010-03-23 08:37 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 33ecf977ac..68b6944301 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -45,6 +45,12 @@ DIRS += \
    hbssl \
    rddads \
    rddsql \
+   sddmy \
+   sddpg \
+   sddfb \
+   sddoci \
+   sddodbc \
+   sddsqlt3 \
 
 # contribs dependent on above
 DIRS += \
diff --git a/harbour/contrib/rddsql/Makefile b/harbour/contrib/rddsql/Makefile
index 4407d07a9e..708e1df2aa 100644
--- a/harbour/contrib/rddsql/Makefile
+++ b/harbour/contrib/rddsql/Makefile
@@ -13,14 +13,5 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbrddsql.ch \
 
-DIRS := \
-   sddmy \
-   sddpg \
-   sddfb \
-   sddoci \
-   sddodbc \
-   sddsqlt3 \
-
 include $(TOP)$(ROOT)config/header.mk
 include $(TOP)$(ROOT)config/lib.mk
-include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/sddfb/Makefile
similarity index 97%
rename from harbour/contrib/rddsql/sddfb/Makefile
rename to harbour/contrib/sddfb/Makefile
index f849baa2db..1d4a8f2f7a 100644
--- a/harbour/contrib/rddsql/sddfb/Makefile
+++ b/harbour/contrib/sddfb/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT := ../../../
+ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
diff --git a/harbour/contrib/rddsql/sddfb/sddfb.c b/harbour/contrib/sddfb/sddfb.c
similarity index 99%
rename from harbour/contrib/rddsql/sddfb/sddfb.c
rename to harbour/contrib/sddfb/sddfb.c
index 112e68e696..f1af34281e 100644
--- a/harbour/contrib/rddsql/sddfb/sddfb.c
+++ b/harbour/contrib/sddfb/sddfb.c
@@ -158,14 +158,16 @@ static HB_ERRCODE fbConnect( SQLDDCONNECTION * pConnection, PHB_ITEM pItem )
 
    parambuf[ i++ ] = isc_dpb_user_name;
    ul = hb_arrayGetCLen( pItem, 3 );
-   if ( ul > 255 )  ul = 255;
+   if ( ul > 255 )
+      ul = 255;
    parambuf[ i++ ] = ( char ) ul;
    memcpy( parambuf + i, hb_arrayGetCPtr( pItem, 3 ), ul );
    i += ul;
 
    parambuf[ i++ ] = isc_dpb_password;
    ul = hb_arrayGetCLen( pItem, 4 );
-   if ( ul > 255 )  ul = 255;
+   if ( ul > 255 )
+      ul = 255;
    parambuf[ i++ ] = ( char ) ul;
    memcpy( parambuf + i, hb_arrayGetCPtr( pItem, 4 ), ul );
    i += ul;
@@ -494,7 +496,7 @@ static HB_ERRCODE fbGoTo( SQLBASEAREAP pArea, HB_ULONG ulRecNo )
 
                case SQL_LONG:
                   pItem = hb_itemPutNL( NULL, * ( long * ) pVar->sqldata );
-                  break; 
+                  break;
 
                case SQL_FLOAT:
                   pItem = hb_itemPutND( NULL, * ( float * ) pVar->sqldata );
diff --git a/harbour/contrib/rddsql/sddfb/sddfb.hbc b/harbour/contrib/sddfb/sddfb.hbc
similarity index 59%
rename from harbour/contrib/rddsql/sddfb/sddfb.hbc
rename to harbour/contrib/sddfb/sddfb.hbc
index 2c6d1cb440..f45f88f133 100644
--- a/harbour/contrib/rddsql/sddfb/sddfb.hbc
+++ b/harbour/contrib/sddfb/sddfb.hbc
@@ -5,4 +5,4 @@
 libs=sddfb
 libs=fbclient
 
-libs=../rddsql.hbc
+libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/sddmy/Makefile
similarity index 97%
rename from harbour/contrib/rddsql/sddmy/Makefile
rename to harbour/contrib/sddmy/Makefile
index 09e195df81..0c00b5dcd7 100644
--- a/harbour/contrib/rddsql/sddmy/Makefile
+++ b/harbour/contrib/sddmy/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT := ../../../
+ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
diff --git a/harbour/contrib/rddsql/sddmy/sddmy.c b/harbour/contrib/sddmy/sddmy.c
similarity index 100%
rename from harbour/contrib/rddsql/sddmy/sddmy.c
rename to harbour/contrib/sddmy/sddmy.c
diff --git a/harbour/contrib/rddsql/sddmy/sddmy.hbc b/harbour/contrib/sddmy/sddmy.hbc
similarity index 72%
rename from harbour/contrib/rddsql/sddmy/sddmy.hbc
rename to harbour/contrib/sddmy/sddmy.hbc
index e93a7465a9..464f15fe8b 100644
--- a/harbour/contrib/rddsql/sddmy/sddmy.hbc
+++ b/harbour/contrib/sddmy/sddmy.hbc
@@ -6,4 +6,4 @@ libs=sddmy
 {unix}libs=mysqlclient
 {!unix}libs=libmysql
 
-libs=../rddsql.hbc
+libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddmy/tests/hbmk.hbm b/harbour/contrib/sddmy/tests/hbmk.hbm
similarity index 100%
rename from harbour/contrib/rddsql/sddmy/tests/hbmk.hbm
rename to harbour/contrib/sddmy/tests/hbmk.hbm
diff --git a/harbour/contrib/rddsql/sddmy/tests/test1.prg b/harbour/contrib/sddmy/tests/test1.prg
similarity index 100%
rename from harbour/contrib/rddsql/sddmy/tests/test1.prg
rename to harbour/contrib/sddmy/tests/test1.prg
diff --git a/harbour/contrib/rddsql/sddoci/Makefile b/harbour/contrib/sddoci/Makefile
similarity index 98%
rename from harbour/contrib/rddsql/sddoci/Makefile
rename to harbour/contrib/sddoci/Makefile
index f9501e7788..9eb5935b98 100644
--- a/harbour/contrib/rddsql/sddoci/Makefile
+++ b/harbour/contrib/sddoci/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT := ../../../
+ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
diff --git a/harbour/contrib/rddsql/sddoci/sddoci.c b/harbour/contrib/sddoci/sddoci.c
similarity index 100%
rename from harbour/contrib/rddsql/sddoci/sddoci.c
rename to harbour/contrib/sddoci/sddoci.c
diff --git a/harbour/contrib/rddsql/sddoci/sddoci.hbc b/harbour/contrib/sddoci/sddoci.hbc
similarity index 85%
rename from harbour/contrib/rddsql/sddoci/sddoci.hbc
rename to harbour/contrib/sddoci/sddoci.hbc
index 86e60e699d..3ac1d39d4b 100644
--- a/harbour/contrib/rddsql/sddoci/sddoci.hbc
+++ b/harbour/contrib/sddoci/sddoci.hbc
@@ -7,4 +7,4 @@ libs=sddoci
 {HB_WITH_OCILIB_MIXED}libs=ocilibm
 {!HB_WITH_OCILIB_UNICODE&!HB_WITH_OCILIB_MIXED}libs=ociliba
 
-libs=../rddsql.hbc
+libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddoci/tests/hbmk.hbm b/harbour/contrib/sddoci/tests/hbmk.hbm
similarity index 100%
rename from harbour/contrib/rddsql/sddoci/tests/hbmk.hbm
rename to harbour/contrib/sddoci/tests/hbmk.hbm
diff --git a/harbour/contrib/rddsql/sddoci/tests/test1.prg b/harbour/contrib/sddoci/tests/test1.prg
similarity index 100%
rename from harbour/contrib/rddsql/sddoci/tests/test1.prg
rename to harbour/contrib/sddoci/tests/test1.prg
diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/sddpg/Makefile
similarity index 97%
rename from harbour/contrib/rddsql/sddpg/Makefile
rename to harbour/contrib/sddpg/Makefile
index 9092254b16..2d9cd82c2b 100644
--- a/harbour/contrib/rddsql/sddpg/Makefile
+++ b/harbour/contrib/sddpg/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT := ../../../
+ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
diff --git a/harbour/contrib/rddsql/sddpg/sddpg.c b/harbour/contrib/sddpg/sddpg.c
similarity index 100%
rename from harbour/contrib/rddsql/sddpg/sddpg.c
rename to harbour/contrib/sddpg/sddpg.c
diff --git a/harbour/contrib/rddsql/sddpg/sddpg.hbc b/harbour/contrib/sddpg/sddpg.hbc
similarity index 68%
rename from harbour/contrib/rddsql/sddpg/sddpg.hbc
rename to harbour/contrib/sddpg/sddpg.hbc
index 2fcc5e03bb..d91c3d6dea 100644
--- a/harbour/contrib/rddsql/sddpg/sddpg.hbc
+++ b/harbour/contrib/sddpg/sddpg.hbc
@@ -6,4 +6,4 @@ libs=sddpg
 {unix}libs=pq
 {!unix}libs=libpq
 
-libs=../rddsql.hbc
+libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddsqlt3/Makefile b/harbour/contrib/sddsqlt3/Makefile
similarity index 97%
rename from harbour/contrib/rddsql/sddsqlt3/Makefile
rename to harbour/contrib/sddsqlt3/Makefile
index 570e1f2dcd..0ccc90c15c 100644
--- a/harbour/contrib/rddsql/sddsqlt3/Makefile
+++ b/harbour/contrib/sddsqlt3/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT := ../../../
+ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.mk
 
diff --git a/harbour/contrib/rddsql/sddsqlt3/sddsqlt3.c b/harbour/contrib/sddsqlt3/sddsqlt3.c
similarity index 99%
rename from harbour/contrib/rddsql/sddsqlt3/sddsqlt3.c
rename to harbour/contrib/sddsqlt3/sddsqlt3.c
index eb3df063b7..7376735d10 100644
--- a/harbour/contrib/rddsql/sddsqlt3/sddsqlt3.c
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.c
@@ -195,9 +195,7 @@ static HB_ERRCODE sqlite3Connect( SQLDDCONNECTION * pConnection, PHB_ITEM pItem
       ( ( SDDCONN * ) pConnection->pSDDConn )->pDb = db;
    }
    else
-   {
       sqlite3_close( db );
-   }
 
    hb_strfree( hConn );
    return db ? HB_SUCCESS : HB_FAILURE;
@@ -415,9 +413,8 @@ static HB_ERRCODE sqlite3Close( SQLBASEAREAP pArea )
    SDDDATA * pSDDData = ( SDDDATA * ) pArea->pSDDData;
 
    if( pSDDData->pStmt )
-   {
       sqlite3_finalize( pSDDData->pStmt );
-   }
+
    hb_xfree( pSDDData );
    return HB_SUCCESS;
 }
diff --git a/harbour/contrib/rddsql/sddsqlt3/sddsqlt3.hbc b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
similarity index 60%
rename from harbour/contrib/rddsql/sddsqlt3/sddsqlt3.hbc
rename to harbour/contrib/sddsqlt3/sddsqlt3.hbc
index 221e25b0a3..ff119410e0 100644
--- a/harbour/contrib/rddsql/sddsqlt3/sddsqlt3.hbc
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbc
@@ -5,4 +5,4 @@
 libs=sddsqlt3
 libs=sqlite3
 
-libs=../rddsql.hbc
+libs=../rddsql/rddsql.hbc
diff --git a/harbour/contrib/rddsql/sddsqlt3/tests/hbmk.hbm b/harbour/contrib/sddsqlt3/tests/hbmk.hbm
similarity index 100%
rename from harbour/contrib/rddsql/sddsqlt3/tests/hbmk.hbm
rename to harbour/contrib/sddsqlt3/tests/hbmk.hbm
diff --git a/harbour/contrib/rddsql/sddsqlt3/tests/test.sq3 b/harbour/contrib/sddsqlt3/tests/test.sq3
similarity index 100%
rename from harbour/contrib/rddsql/sddsqlt3/tests/test.sq3
rename to harbour/contrib/sddsqlt3/tests/test.sq3
diff --git a/harbour/contrib/rddsql/sddsqlt3/tests/test1.prg b/harbour/contrib/sddsqlt3/tests/test1.prg
similarity index 100%
rename from harbour/contrib/rddsql/sddsqlt3/tests/test1.prg
rename to harbour/contrib/sddsqlt3/tests/test1.prg