diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 04c89c3123..b44b3131e1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,46 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-01 19:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbqt/hbqt_common.hbc
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/hbqtcore.hbc
+  - contrib/hbqt/hbqtcore.hbp
+  - contrib/hbqt/hbqtcores.hbp
+  - contrib/hbqt/hbqtcore_filelist.hbm
+  + contrib/hbqt/qtgui/hbqtgui.hbc
+  + contrib/hbqt/qtgui/hbqtgui.hbm
+  + contrib/hbqt/qtgui/hbqtgui.hbp
+  + contrib/hbqt/qtgui/hbqtguis.hbp
+  - contrib/hbqt/hbqtgui_filelist.hbm
+  + contrib/hbqt/qtcore/hbqtcore.hbc
+  + contrib/hbqt/qtcore/hbqtcore.hbm
+  + contrib/hbqt/qtcore/hbqtcore.hbp
+  + contrib/hbqt/qtcore/hbqtcores.hbp
+  - contrib/hbqt/hbqtgui.hbp
+  - contrib/hbqt/hbqtguis.hbp
+  - contrib/hbqt/hbqtnetwork.hbp
+  - contrib/hbqt/hbqtnetworks.hbp
+  + contrib/hbqt/qtnetwork/hbqtnetwork.hbc
+  + contrib/hbqt/qtnetwork/hbqtnetwork.hbp
+  + contrib/hbqt/qtnetwork/hbqtnetworks.hbp
+  * contrib/hbplist
+    * Moved as much as possible make logic to components.
+      (left central .hbc file to make autofind happy
+      and hide internal layout details from users)
+    ! Missed some files form prev commits.
+
+  + contrib/hbqt/hbqt.hbp
+    + Readded central make file to make it easy to build all
+      sub-components at once.
+
+  - contrib/hbqt/generator2
+  + contrib/hbqt/generator/hbqtgen2.prg
+  + contrib/hbqt/generator/QtGui.txt
+  + contrib/hbqt/generator/QtCore.txt
+  + contrib/hbqt/generator/QtNetwork.txt
+    * Moved generator2 code to generator dir.
+
 2010-08-01 18:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   - contrib/hbqt/qth
   - contrib/hbqt/doc
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index 058ae2c7b2..d0a4dc48a8 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -30,9 +30,9 @@ hbnetio/utils/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp
-hbqt/hbqtcore.hbp
-hbqt/hbqtgui.hbp
-hbqt/hbqtnetwork.hbp
+hbqt/qtcore/hbqtcore.hbp
+hbqt/qtgui/hbqtgui.hbp
+hbqt/qtnetwork/hbqtnetwork.hbp
 hbsms/hbsms.hbp
 hbsqlit3/hbsqlit3.hbp            # uses: sqlite3 (external)
 hbssl/hbssl.hbp
diff --git a/harbour/contrib/hbqt/generator2/QtCore.txt b/harbour/contrib/hbqt/generator/QtCore.txt
similarity index 100%
rename from harbour/contrib/hbqt/generator2/QtCore.txt
rename to harbour/contrib/hbqt/generator/QtCore.txt
diff --git a/harbour/contrib/hbqt/generator2/QtGui.txt b/harbour/contrib/hbqt/generator/QtGui.txt
similarity index 100%
rename from harbour/contrib/hbqt/generator2/QtGui.txt
rename to harbour/contrib/hbqt/generator/QtGui.txt
diff --git a/harbour/contrib/hbqt/generator2/QtNetwork.txt b/harbour/contrib/hbqt/generator/QtNetwork.txt
similarity index 100%
rename from harbour/contrib/hbqt/generator2/QtNetwork.txt
rename to harbour/contrib/hbqt/generator/QtNetwork.txt
diff --git a/harbour/contrib/hbqt/generator2/hbqtgen2.prg b/harbour/contrib/hbqt/generator/hbqtgen2.prg
similarity index 100%
rename from harbour/contrib/hbqt/generator2/hbqtgen2.prg
rename to harbour/contrib/hbqt/generator/hbqtgen2.prg
diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp
new file mode 100644
index 0000000000..ba96a42a78
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+qtcore/hbqtcore.hbp
+qtgui/hbqtgui.hbp
+qtnetwork/hbqtnetwork.hbp
diff --git a/harbour/contrib/hbqt/hbqt_common.hbc b/harbour/contrib/hbqt/hbqt_common.hbc
new file mode 100644
index 0000000000..9f6dcf4ce4
--- /dev/null
+++ b/harbour/contrib/hbqt/hbqt_common.hbc
@@ -0,0 +1,25 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp}).
+
+incpaths=.
+
+plugins=hbmk2_plugin_qt.hbs
+
+{msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
+
+{allwin|os2}libpaths=${HB_WITH_QT}\..\lib
+
+{allgcc}libs=supc++
+
+{win|os2}hbcppmm=yes
+
+gui=yes
+gt=gtnul
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 4b5a938969..c69846e953 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -3,7 +3,7 @@
 #
 
 # ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
diff --git a/harbour/contrib/hbqt/hbqtcore.hbc b/harbour/contrib/hbqt/hbqtcore.hbc
index 790869dbac..1b92ce7255 100644
--- a/harbour/contrib/hbqt/hbqtcore.hbc
+++ b/harbour/contrib/hbqt/hbqtcore.hbc
@@ -3,32 +3,8 @@
 #
 
 # ---------------------------------------------------------------
-# Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
 # See COPYING for licensing terms.
 # ---------------------------------------------------------------
 
-stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp}).
-
-incpaths=.
-
-plugins=hbmk2_plugin_qt.hbs
-
-{msvc}ldflags=-nodefaultlib:msvcrt.lib -defaultlib:libcmt.lib
-
-{allwin|os2}libpaths=${HB_WITH_QT}\..\lib
-
-# TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed.
-{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
-{!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4
-{!HB_STATIC_QT&linux}libs=QtCore QtGui
-{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui
-{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
-{HB_STATIC_QT&linux}libs=hbqtcore
-{HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui
-
-{allgcc}libs=supc++
-
-{win|os2}hbcppmm=yes
-
-gui=yes
-gt=gtnul
+libs=qtcore/hbqtcore.hbc
diff --git a/harbour/contrib/hbqt/hbqtcore.hbp b/harbour/contrib/hbqt/hbqtcore.hbp
deleted file mode 100644
index dcbff1df7c..0000000000
--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtcore/filelist.hbm
-hbqtcore_filelist.hbm
-
-hbqtcores.hbp
diff --git a/harbour/contrib/hbqt/hbqtcore_filelist.hbm b/harbour/contrib/hbqt/hbqtcore_filelist.hbm
deleted file mode 100644
index fb85b1c71d..0000000000
--- a/harbour/contrib/hbqt/hbqtcore_filelist.hbm
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_base.cpp
-hbqt_destruct.cpp
-hbqt_hbevents.cpp
-hbqt_hbslots.cpp
-hbqt_utils.cpp
-hbqt_misc.prg
-
-hbqt_hbevents.h
-hbqt_hbslots.h
diff --git a/harbour/contrib/hbqt/hbqtgui.hbp b/harbour/contrib/hbqt/hbqtgui.hbp
deleted file mode 100644
index 35338cfb43..0000000000
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtgui/filelist.hbm
-hbqtgui_filelist.hbm
-
-hbqtcore.hbc
-
-hbqtguis.hbp
diff --git a/harbour/contrib/hbqt/hbqtgui_filelist.hbm b/harbour/contrib/hbqt/hbqtgui_filelist.hbm
deleted file mode 100644
index 8c990a9d4e..0000000000
--- a/harbour/contrib/hbqt/hbqtgui_filelist.hbm
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_hbqabstractitemmodel.cpp
-hbqt_hbqmainwindow.cpp
-hbqt_hbqplaintextedit.cpp
-hbqt_hbqsyntaxhighlighter.cpp
-hbqt_hbqtableview.cpp
-
-hbqt_hbqabstractitemmodel.h
-hbqt_hbqmainwindow.h
-hbqt_hbqplaintextedit.h
-hbqt_hbqsyntaxhighlighter.h
-hbqt_hbqtableview.h
-
-hbqt_errorsys.prg
-THbQtUI.prg
diff --git a/harbour/contrib/hbqt/hbqtnetwork.hbp b/harbour/contrib/hbqt/hbqtnetwork.hbp
deleted file mode 100644
index 9356cbd595..0000000000
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-hbqt_common.hbm
-
-qtnetwork/filelist.hbm
-
-hbqtcore.hbc
-
-hbqtnetworks.hbp
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbc b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
new file mode 100644
index 0000000000..931e05eab4
--- /dev/null
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbc
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../hbqt_common.hbc
+
+# TOFIX: QtGui is needed by hbqt_hbslots.cpp. This dependency should be removed.
+{!HB_STATIC_QT}libs=hbqtcore${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtCore4 QtGui4
+{!HB_STATIC_QT&linux}libs=QtCore QtGui
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtCore.framework/QtCore /Library/Frameworks/QtGui.framework/QtGui
+{HB_STATIC_QT&allwin}libs=hbqtcores${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtcore
+{HB_STATIC_QT&(allwin|linux)}libs=QtCore QtGui
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
new file mode 100644
index 0000000000..bddef92e79
--- /dev/null
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm
@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+
+../hbqt_base.cpp
+../hbqt_destruct.cpp
+../hbqt_hbevents.cpp
+../hbqt_hbslots.cpp
+../hbqt_utils.cpp
+../hbqt_misc.prg
+
+../hbqt_hbevents.h
+../hbqt_hbslots.h
diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbp b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
new file mode 100644
index 0000000000..5388e7b105
--- /dev/null
+++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbp
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+hbqtcore.hbm
+
+hbqtcores.hbp
diff --git a/harbour/contrib/hbqt/hbqtnetworks.hbp b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
similarity index 56%
rename from harbour/contrib/hbqt/hbqtnetworks.hbp
rename to harbour/contrib/hbqt/qtcore/hbqtcores.hbp
index d03246d604..db816a6b2e 100644
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/qtcore/hbqtcores.hbp
@@ -2,11 +2,10 @@
 # $Id$
 #
 
-hbqt_common.hbm
+../hbqt_common.hbm
 
-qtnetwork/filelist.hbm
-
-hbqtcore.hbc
+filelist.hbm
+hbqtcore.hbm
 
 -stop{!HB_QT_BUILD_STATIC|!allwin}
 
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbc b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
new file mode 100644
index 0000000000..e99b65606d
--- /dev/null
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbc
@@ -0,0 +1,20 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../qtcore/hbqtcore.hbc
+
+{!HB_STATIC_QT}libs=hbqtgui${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtGui4
+{!HB_STATIC_QT&linux}libs=QtGui
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtGui.framework/QtGui
+{!HB_STATIC_QT}libs=QtUiTools
+{HB_STATIC_QT&allwin}libs=hbqtguis${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtgui
+{HB_STATIC_QT&(allwin|linux)}libs=QtGui
+{HB_STATIC_QT&(allwin|linux)}libs=QtUiTools
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
new file mode 100644
index 0000000000..d3dab7d995
--- /dev/null
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm
@@ -0,0 +1,18 @@
+#
+# $Id$
+#
+
+../hbqt_hbqabstractitemmodel.cpp
+../hbqt_hbqmainwindow.cpp
+../hbqt_hbqplaintextedit.cpp
+../hbqt_hbqsyntaxhighlighter.cpp
+../hbqt_hbqtableview.cpp
+
+../hbqt_hbqabstractitemmodel.h
+../hbqt_hbqmainwindow.h
+../hbqt_hbqplaintextedit.h
+../hbqt_hbqsyntaxhighlighter.h
+../hbqt_hbqtableview.h
+
+../hbqt_errorsys.prg
+../THbQtUI.prg
diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbp b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
new file mode 100644
index 0000000000..feeb49fb6a
--- /dev/null
+++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+hbqtgui.hbm
+
+../qtcore/hbqtcore.hbc
+
+hbqtguis.hbp
diff --git a/harbour/contrib/hbqt/hbqtguis.hbp b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
similarity index 50%
rename from harbour/contrib/hbqt/hbqtguis.hbp
rename to harbour/contrib/hbqt/qtgui/hbqtguis.hbp
index 30587adbb1..b20299c79b 100644
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/qtgui/hbqtguis.hbp
@@ -2,12 +2,12 @@
 # $Id$
 #
 
-hbqt_common.hbm
+../hbqt_common.hbm
 
-qtgui/filelist.hbm
-hbqtgui_filelist.hbm
+filelist.hbm
+hbqtgui.hbm
 
-hbqtcore.hbc
+../qtcore/hbqtcore.hbc
 
 -stop{!HB_QT_BUILD_STATIC|!allwin}
 
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
new file mode 100644
index 0000000000..dc7d4e1cf7
--- /dev/null
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbc
@@ -0,0 +1,18 @@
+#
+# $Id$
+#
+
+# ---------------------------------------------------------------
+# Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
+# See COPYING for licensing terms.
+# ---------------------------------------------------------------
+
+libs=../qtcore/hbqtcore.hbc
+
+{!HB_STATIC_QT}libs=hbqtnetwork${__HB_DYN__}
+{!HB_STATIC_QT&(allwin|os2)}libs=QtNetwork4
+{!HB_STATIC_QT&linux}libs=QtNetwork
+{!HB_STATIC_QT&darwin}libs=/Library/Frameworks/QtNetwork.framework/QtNetwork
+{HB_STATIC_QT&allwin}libs=hbqtnetworks${__HB_DYN__}
+{HB_STATIC_QT&linux}libs=hbqtnetwork
+{HB_STATIC_QT&(allwin|linux)}libs=QtNetwork
diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
new file mode 100644
index 0000000000..8751c3b280
--- /dev/null
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbp
@@ -0,0 +1,11 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+filelist.hbm
+
+../qtcore/hbqtcore.hbc
+
+hbqtnetworks.hbp
diff --git a/harbour/contrib/hbqt/hbqtcores.hbp b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
similarity index 53%
rename from harbour/contrib/hbqt/hbqtcores.hbp
rename to harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
index 13b9f4c6a4..79d72a4232 100644
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetworks.hbp
@@ -2,10 +2,11 @@
 # $Id$
 #
 
-hbqt_common.hbm
+../hbqt_common.hbm
 
-qtcore/filelist.hbm
-hbqtcore_filelist.hbm
+filelist.hbm
+
+../qtcore/hbqtcore.hbc
 
 -stop{!HB_QT_BUILD_STATIC|!allwin}