diff --git a/modules/qt_clucene.pri b/modules/qt_clucene.pri
index 49e79f5b6799cdcf5463e3e662fb22dac7b11fd0..e8d56b5f75339c4717b8f2b0d92bacb4b73632cb 100644
--- a/modules/qt_clucene.pri
+++ b/modules/qt_clucene.pri
@@ -7,8 +7,11 @@ QT.clucene.name = QtCLucene
 QT.clucene.bins = $$QT_MODULE_BIN_BASE
 QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene
 QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/$$QT.clucene.VERSION
-QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch
+QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/clucene
 QT.clucene.libs = $$QT_MODULE_LIB_BASE
 QT.clucene.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.clucene.imports = $$QT_MODULE_IMPORT_BASE
 QT.clucene.depends = core
+QT.clucene.defines = QT_CLUCLENE_LIB
+
+QT_CONFIG += clucene
diff --git a/modules/qt_help.pri b/modules/qt_help.pri
index f4e088780af625bb085d3b369d9097a458f492fd..a61086ccc71e9092b26c7703d7719c3a3992e25c 100644
--- a/modules/qt_help.pri
+++ b/modules/qt_help.pri
@@ -7,9 +7,11 @@ QT.help.name = QtHelp
 QT.help.bins = $$QT_MODULE_BIN_BASE
 QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
 QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/$$QT.help.VERSION
-QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib
+QT.help.sources = $$QT_MODULE_BASE/src/assistant/help
 QT.help.libs = $$QT_MODULE_LIB_BASE
 QT.help.plugins = $$QT_MODULE_PLUGIN_BASE
 QT.help.imports = $$QT_MODULE_IMPORT_BASE
-QT.help.depends = network xml sql
+QT.help.depends = network sql
 QT.help.DEFINES = QT_HELP_LIB
+
+QT_CONFIG += help
diff --git a/3rdparty/clucene/APACHE.license b/src/assistant/3rdparty/clucene/APACHE.license
similarity index 100%
rename from 3rdparty/clucene/APACHE.license
rename to src/assistant/3rdparty/clucene/APACHE.license
diff --git a/3rdparty/clucene/AUTHORS b/src/assistant/3rdparty/clucene/AUTHORS
similarity index 100%
rename from 3rdparty/clucene/AUTHORS
rename to src/assistant/3rdparty/clucene/AUTHORS
diff --git a/3rdparty/clucene/COPYING b/src/assistant/3rdparty/clucene/COPYING
similarity index 100%
rename from 3rdparty/clucene/COPYING
rename to src/assistant/3rdparty/clucene/COPYING
diff --git a/3rdparty/clucene/ChangeLog b/src/assistant/3rdparty/clucene/ChangeLog
similarity index 100%
rename from 3rdparty/clucene/ChangeLog
rename to src/assistant/3rdparty/clucene/ChangeLog
diff --git a/3rdparty/clucene/LGPL.license b/src/assistant/3rdparty/clucene/LGPL.license
similarity index 100%
rename from 3rdparty/clucene/LGPL.license
rename to src/assistant/3rdparty/clucene/LGPL.license
diff --git a/3rdparty/clucene/README b/src/assistant/3rdparty/clucene/README
similarity index 100%
rename from 3rdparty/clucene/README
rename to src/assistant/3rdparty/clucene/README
diff --git a/3rdparty/clucene/src/CLucene.h b/src/assistant/3rdparty/clucene/src/CLucene.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene.h
rename to src/assistant/3rdparty/clucene/src/CLucene.h
diff --git a/3rdparty/clucene/src/CLucene/CLBackwards.h b/src/assistant/3rdparty/clucene/src/CLucene/CLBackwards.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/CLBackwards.h
rename to src/assistant/3rdparty/clucene/src/CLucene/CLBackwards.h
diff --git a/3rdparty/clucene/src/CLucene/CLConfig.h b/src/assistant/3rdparty/clucene/src/CLucene/CLConfig.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/CLConfig.h
rename to src/assistant/3rdparty/clucene/src/CLucene/CLConfig.h
diff --git a/3rdparty/clucene/src/CLucene/CLMonolithic.cpp b/src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/CLMonolithic.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/CLMonolithic.cpp
diff --git a/3rdparty/clucene/src/CLucene/LuceneThreads.h b/src/assistant/3rdparty/clucene/src/CLucene/LuceneThreads.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/LuceneThreads.h
rename to src/assistant/3rdparty/clucene/src/CLucene/LuceneThreads.h
diff --git a/3rdparty/clucene/src/CLucene/StdHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/StdHeader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/StdHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/StdHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/StdHeader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/StdHeader.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/AnalysisHeader.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/Analyzers.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/Analyzers.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/Analyzers.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardAnalyzer.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardFilter.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.cpp
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizer.h
diff --git a/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h b/src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
rename to src/assistant/3rdparty/clucene/src/CLucene/analysis/standard/StandardTokenizerConstants.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerAcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/CompilerAcc.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/CompilerAcc.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerBcb.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerBcb.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/CompilerBcb.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/CompilerBcb.h
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerGcc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
similarity index 98%
rename from 3rdparty/clucene/src/CLucene/config/CompilerGcc.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
index a9120988b7c753e72c101f0ea15bdfd6168c9910..41310cefef806137e6425ffd3693684d5320545a 100644
--- a/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
+++ b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerGcc.h
@@ -12,7 +12,7 @@
 // It is internal CLucene header - DO NOT include it directly
 #if !defined(_SUPPRESS_MAKE_BASED_CONFIG)
     #if defined(_BUILD_FOR_QT_)
-        #include "fulltextsearch/qclucene-config_p.h"
+        #include "qclucene-config_p.h"
     #else
         #include "CLucene/clucene-config.h" //make clucene-config.h file
     #endif
diff --git a/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h b/src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/CompilerMsvc.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformMac.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformMac.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/PlatformMac.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/PlatformMac.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformUnix.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformUnix.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/PlatformUnix.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/PlatformUnix.h
diff --git a/3rdparty/clucene/src/CLucene/config/PlatformWin32.h b/src/assistant/3rdparty/clucene/src/CLucene/config/PlatformWin32.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/PlatformWin32.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/PlatformWin32.h
diff --git a/3rdparty/clucene/src/CLucene/config/compiler.h b/src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/compiler.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/compiler.h
diff --git a/3rdparty/clucene/src/CLucene/config/define_std.h b/src/assistant/3rdparty/clucene/src/CLucene/config/define_std.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/define_std.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/define_std.h
diff --git a/3rdparty/clucene/src/CLucene/config/gunichartables.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/gunichartables.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/gunichartables.h b/src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/gunichartables.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/gunichartables.h
diff --git a/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_lltot.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tchar.h b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tchar.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tchar.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tchar.h
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcscasecmp.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcslwr.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstod.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tcstoll.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_tprintf.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/repl_wchar.h b/src/assistant/3rdparty/clucene/src/CLucene/config/repl_wchar.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/repl_wchar.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/repl_wchar.h
diff --git a/3rdparty/clucene/src/CLucene/config/threadCSection.h b/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/threadCSection.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h
diff --git a/3rdparty/clucene/src/CLucene/config/threadPthread.h b/src/assistant/3rdparty/clucene/src/CLucene/config/threadPthread.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/threadPthread.h
rename to src/assistant/3rdparty/clucene/src/CLucene/config/threadPthread.h
diff --git a/3rdparty/clucene/src/CLucene/config/threads.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/threads.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp
diff --git a/3rdparty/clucene/src/CLucene/config/utf8.cpp b/src/assistant/3rdparty/clucene/src/CLucene/config/utf8.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/config/utf8.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/config/utf8.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/condition.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/condition.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/condition.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/condition.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/condition.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/condition.h
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/condition.h
diff --git a/3rdparty/clucene/src/CLucene/debug/error.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/error.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/error.cpp
diff --git a/3rdparty/clucene/src/CLucene/debug/error.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/error.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/error.h
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/error.h
diff --git a/3rdparty/clucene/src/CLucene/debug/lucenebase.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/lucenebase.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/lucenebase.h
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/lucenebase.h
diff --git a/3rdparty/clucene/src/CLucene/debug/mem.h b/src/assistant/3rdparty/clucene/src/CLucene/debug/mem.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/mem.h
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/mem.h
diff --git a/3rdparty/clucene/src/CLucene/debug/memtracking.cpp b/src/assistant/3rdparty/clucene/src/CLucene/debug/memtracking.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/debug/memtracking.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/debug/memtracking.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/DateField.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/DateField.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/document/DateField.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/DateField.h b/src/assistant/3rdparty/clucene/src/CLucene/document/DateField.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/DateField.h
rename to src/assistant/3rdparty/clucene/src/CLucene/document/DateField.h
diff --git a/3rdparty/clucene/src/CLucene/document/Document.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/Document.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/document/Document.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/Document.h b/src/assistant/3rdparty/clucene/src/CLucene/document/Document.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/Document.h
rename to src/assistant/3rdparty/clucene/src/CLucene/document/Document.h
diff --git a/3rdparty/clucene/src/CLucene/document/Field.cpp b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/Field.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/document/Field.cpp
diff --git a/3rdparty/clucene/src/CLucene/document/Field.h b/src/assistant/3rdparty/clucene/src/CLucene/document/Field.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/document/Field.h
rename to src/assistant/3rdparty/clucene/src/CLucene/document/Field.h
diff --git a/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/CompoundFile.h b/src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/CompoundFile.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/CompoundFile.h
diff --git a/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/DocumentWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/DocumentWriter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/DocumentWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfo.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldInfo.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldInfos.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldInfos.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldsReader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldsReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/FieldsWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/FieldsWriter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/FieldsWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexModifier.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexModifier.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexModifier.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexReader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/IndexWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/IndexWriter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/IndexWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/MultiReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/MultiReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/MultiReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/MultiReader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/MultiReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentHeader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentHeader.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentInfos.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentInfos.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentInfos.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMergeQueue.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentMerger.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentMerger.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentMerger.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermDocs.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermPositions.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/SegmentTermVector.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Term.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/Term.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/Term.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Term.h b/src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/Term.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/Term.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfo.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfo.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfo.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfo.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfo.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosReader.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfosReader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosReader.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermInfosWriter.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermVector.h b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermVector.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermVector.h
diff --git a/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorReader.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/index/TermVectorWriter.cpp
diff --git a/3rdparty/clucene/src/CLucene/index/Terms.h b/src/assistant/3rdparty/clucene/src/CLucene/index/Terms.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/index/Terms.h
rename to src/assistant/3rdparty/clucene/src/CLucene/index/Terms.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/Lexer.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/Lexer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/Lexer.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/MultiFieldQueryParser.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParser.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryParserBase.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/QueryToken.h
diff --git a/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.cpp
diff --git a/3rdparty/clucene/src/CLucene/queryParser/TokenList.h b/src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/queryParser/TokenList.h
rename to src/assistant/3rdparty/clucene/src/CLucene/queryParser/TokenList.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanClause.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanClause.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/BooleanClause.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/BooleanClause.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/BooleanQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/BooleanQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/BooleanScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/BooleanScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/BooleanScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/CachingWrapperFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ChainedFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ChainedFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ChainedFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/Compare.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Compare.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Compare.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Compare.h
diff --git a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ConjunctionScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/DateFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/DateFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/DateFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/DateFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/DateFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/ExactPhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/Explanation.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Explanation.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Explanation.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Explanation.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Explanation.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCache.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldCache.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCache.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldCache.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldCache.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDoc.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDoc.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldDoc.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldDoc.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldDocSortedHitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FieldSortedHitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/Filter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Filter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Filter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Filter.h
diff --git a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FilteredTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/FuzzyQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/HitQueue.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/HitQueue.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/HitQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/HitQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/HitQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/Hits.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Hits.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Hits.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Hits.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/IndexSearcher.h b/src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/IndexSearcher.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/IndexSearcher.h
diff --git a/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/MultiSearcher.h b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/MultiSearcher.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/MultiSearcher.h
diff --git a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/MultiTermQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhrasePositions.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhrasePositions.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhrasePositions.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhraseQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhraseQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhraseQueue.h
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PhraseScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/PrefixQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/PrefixQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/PrefixQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/QueryFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/QueryFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/QueryFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/RangeFilter.h b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/RangeFilter.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/RangeFilter.h
diff --git a/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/RangeQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/RangeQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/RangeQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/Scorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Scorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Scorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Scorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/SearchHeader.h b/src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/SearchHeader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/SearchHeader.h
diff --git a/3rdparty/clucene/src/CLucene/search/Similarity.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Similarity.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Similarity.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Similarity.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Similarity.h
diff --git a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/SloppyPhraseScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/Sort.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Sort.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Sort.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/Sort.h b/src/assistant/3rdparty/clucene/src/CLucene/search/Sort.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/Sort.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/Sort.h
diff --git a/3rdparty/clucene/src/CLucene/search/TermQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/TermQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/TermQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/TermQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/TermQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/TermScorer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/TermScorer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/TermScorer.h b/src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/TermScorer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/TermScorer.h
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardQuery.h b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/WildcardQuery.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/WildcardQuery.h
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.cpp
diff --git a/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h b/src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
rename to src/assistant/3rdparty/clucene/src/CLucene/search/WildcardTermEnum.h
diff --git a/3rdparty/clucene/src/CLucene/store/Directory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/Directory.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/Directory.h
diff --git a/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/FSDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/FSDirectory.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/FSDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/store/IndexInput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/IndexInput.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/IndexInput.h b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/IndexInput.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/IndexInput.h
diff --git a/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/IndexOutput.h b/src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/IndexOutput.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/IndexOutput.h
diff --git a/3rdparty/clucene/src/CLucene/store/InputStream.h b/src/assistant/3rdparty/clucene/src/CLucene/store/InputStream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/InputStream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/InputStream.h
diff --git a/3rdparty/clucene/src/CLucene/store/Lock.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/Lock.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/Lock.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/Lock.h b/src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/Lock.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/Lock.h
diff --git a/3rdparty/clucene/src/CLucene/store/MMapInput.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/MMapInput.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/MMapInput.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/MMapInput.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/OutputStream.h b/src/assistant/3rdparty/clucene/src/CLucene/store/OutputStream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/OutputStream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/OutputStream.h
diff --git a/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/RAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/RAMDirectory.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/RAMDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.cpp
diff --git a/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h b/src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
rename to src/assistant/3rdparty/clucene/src/CLucene/store/TransactionalRAMDirectory.h
diff --git a/3rdparty/clucene/src/CLucene/util/Arrays.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Arrays.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Arrays.h
diff --git a/3rdparty/clucene/src/CLucene/util/BitSet.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/BitSet.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/BitSet.h b/src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/BitSet.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/BitSet.h
diff --git a/3rdparty/clucene/src/CLucene/util/Equators.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Equators.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Equators.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Equators.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Equators.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Equators.h
diff --git a/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/FastCharStream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/FastCharStream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/FastCharStream.h
diff --git a/3rdparty/clucene/src/CLucene/util/Misc.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Misc.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Misc.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Misc.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Misc.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Misc.h
diff --git a/3rdparty/clucene/src/CLucene/util/PriorityQueue.h b/src/assistant/3rdparty/clucene/src/CLucene/util/PriorityQueue.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/PriorityQueue.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/PriorityQueue.h
diff --git a/3rdparty/clucene/src/CLucene/util/Reader.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Reader.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Reader.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/Reader.h b/src/assistant/3rdparty/clucene/src/CLucene/util/Reader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/Reader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/Reader.h
diff --git a/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/StringBuffer.h b/src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/StringBuffer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/StringBuffer.h
diff --git a/3rdparty/clucene/src/CLucene/util/StringIntern.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/StringIntern.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/StringIntern.h b/src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/StringIntern.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/StringIntern.h
diff --git a/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/ThreadLocal.h b/src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/ThreadLocal.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/ThreadLocal.h
diff --git a/3rdparty/clucene/src/CLucene/util/VoidList.h b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidList.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/VoidList.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/VoidList.h
diff --git a/3rdparty/clucene/src/CLucene/util/VoidMap.h b/src/assistant/3rdparty/clucene/src/CLucene/util/VoidMap.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/VoidMap.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/VoidMap.h
diff --git a/3rdparty/clucene/src/CLucene/util/bufferedstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/bufferedstream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/bufferedstream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/bufferedstream.h
diff --git a/3rdparty/clucene/src/CLucene/util/dirent.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/dirent.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/dirent.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/dirent.h b/src/assistant/3rdparty/clucene/src/CLucene/util/dirent.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/dirent.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/dirent.h
diff --git a/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
rename to src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp
diff --git a/3rdparty/clucene/src/CLucene/util/fileinputstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/fileinputstream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/fileinputstream.h
diff --git a/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h b/src/assistant/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/inputstreambuffer.h
diff --git a/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h b/src/assistant/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/jstreamsconfig.h
diff --git a/3rdparty/clucene/src/CLucene/util/streambase.h b/src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/streambase.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/streambase.h
diff --git a/3rdparty/clucene/src/CLucene/util/stringreader.h b/src/assistant/3rdparty/clucene/src/CLucene/util/stringreader.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/stringreader.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/stringreader.h
diff --git a/3rdparty/clucene/src/CLucene/util/subinputstream.h b/src/assistant/3rdparty/clucene/src/CLucene/util/subinputstream.h
similarity index 100%
rename from 3rdparty/clucene/src/CLucene/util/subinputstream.h
rename to src/assistant/3rdparty/clucene/src/CLucene/util/subinputstream.h
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index 97196b25323e9bd4835fcbbbd33a1c3ee221e2bd..b16a1892bf653d7adf2d56d29b96ea785ff440af 100644
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -1,6 +1,10 @@
 TEMPLATE = subdirs
 CONFIG  += ordered
 
-SUBDIRS += lib/fulltextsearch \
-           lib \
-           tools
+SUBDIRS += clucene \
+	   help \
+           assistant \
+           qhelpgenerator \
+           qcollectiongenerator \
+           qhelpconverter
+
diff --git a/src/assistant/tools/assistant/Info_mac.plist b/src/assistant/assistant/Info_mac.plist
similarity index 100%
rename from src/assistant/tools/assistant/Info_mac.plist
rename to src/assistant/assistant/Info_mac.plist
diff --git a/src/assistant/tools/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp
similarity index 100%
rename from src/assistant/tools/assistant/aboutdialog.cpp
rename to src/assistant/assistant/aboutdialog.cpp
diff --git a/src/assistant/tools/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h
similarity index 100%
rename from src/assistant/tools/assistant/aboutdialog.h
rename to src/assistant/assistant/aboutdialog.h
diff --git a/src/assistant/tools/assistant/assistant.icns b/src/assistant/assistant/assistant.icns
similarity index 100%
rename from src/assistant/tools/assistant/assistant.icns
rename to src/assistant/assistant/assistant.icns
diff --git a/src/assistant/tools/assistant/assistant.ico b/src/assistant/assistant/assistant.ico
similarity index 100%
rename from src/assistant/tools/assistant/assistant.ico
rename to src/assistant/assistant/assistant.ico
diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
similarity index 93%
rename from src/assistant/tools/assistant/assistant.pro
rename to src/assistant/assistant/assistant.pro
index dc8928bad0d862d641d95b9151c5883b3628e345..37e0282ce363e819145704e103cd1124f4317b11 100644
--- a/src/assistant/tools/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -1,4 +1,3 @@
-include(../../../shared/fontpanel/fontpanel.pri)
 TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
@@ -10,13 +9,12 @@ TARGET = assistant
 CONFIG += qt \
     warn_on \
     help
-QT += widgets network help
+QT += widgets printsupport network help
 PROJECTNAME = Assistant
-DESTDIR = $$QT.designer.bins
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+
 DEPENDPATH += ../shared
-INCLUDEPATH += $$QT.help.includes
+
+include(../../shared/fontpanel/fontpanel.pri)
 
 # ## Work around a qmake issue when statically linking to
 # ## not-yet-installed plugins
diff --git a/src/assistant/tools/assistant/assistant.qch b/src/assistant/assistant/assistant.qch
similarity index 100%
rename from src/assistant/tools/assistant/assistant.qch
rename to src/assistant/assistant/assistant.qch
diff --git a/src/assistant/tools/assistant/assistant.qrc b/src/assistant/assistant/assistant.qrc
similarity index 100%
rename from src/assistant/tools/assistant/assistant.qrc
rename to src/assistant/assistant/assistant.qrc
diff --git a/src/assistant/tools/assistant/assistant.rc b/src/assistant/assistant/assistant.rc
similarity index 100%
rename from src/assistant/tools/assistant/assistant.rc
rename to src/assistant/assistant/assistant.rc
diff --git a/src/assistant/tools/assistant/assistant_images.qrc b/src/assistant/assistant/assistant_images.qrc
similarity index 100%
rename from src/assistant/tools/assistant/assistant_images.qrc
rename to src/assistant/assistant/assistant_images.qrc
diff --git a/src/assistant/tools/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkdialog.cpp
rename to src/assistant/assistant/bookmarkdialog.cpp
diff --git a/src/assistant/tools/assistant/bookmarkdialog.h b/src/assistant/assistant/bookmarkdialog.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkdialog.h
rename to src/assistant/assistant/bookmarkdialog.h
diff --git a/src/assistant/tools/assistant/bookmarkdialog.ui b/src/assistant/assistant/bookmarkdialog.ui
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkdialog.ui
rename to src/assistant/assistant/bookmarkdialog.ui
diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.cpp b/src/assistant/assistant/bookmarkfiltermodel.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkfiltermodel.cpp
rename to src/assistant/assistant/bookmarkfiltermodel.cpp
diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.h b/src/assistant/assistant/bookmarkfiltermodel.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkfiltermodel.h
rename to src/assistant/assistant/bookmarkfiltermodel.h
diff --git a/src/assistant/tools/assistant/bookmarkitem.cpp b/src/assistant/assistant/bookmarkitem.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkitem.cpp
rename to src/assistant/assistant/bookmarkitem.cpp
diff --git a/src/assistant/tools/assistant/bookmarkitem.h b/src/assistant/assistant/bookmarkitem.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkitem.h
rename to src/assistant/assistant/bookmarkitem.h
diff --git a/src/assistant/tools/assistant/bookmarkmanager.cpp b/src/assistant/assistant/bookmarkmanager.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmanager.cpp
rename to src/assistant/assistant/bookmarkmanager.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmanager.h b/src/assistant/assistant/bookmarkmanager.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmanager.h
rename to src/assistant/assistant/bookmarkmanager.h
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmanagerwidget.cpp
rename to src/assistant/assistant/bookmarkmanagerwidget.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.h b/src/assistant/assistant/bookmarkmanagerwidget.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmanagerwidget.h
rename to src/assistant/assistant/bookmarkmanagerwidget.h
diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.ui b/src/assistant/assistant/bookmarkmanagerwidget.ui
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmanagerwidget.ui
rename to src/assistant/assistant/bookmarkmanagerwidget.ui
diff --git a/src/assistant/tools/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmodel.cpp
rename to src/assistant/assistant/bookmarkmodel.cpp
diff --git a/src/assistant/tools/assistant/bookmarkmodel.h b/src/assistant/assistant/bookmarkmodel.h
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkmodel.h
rename to src/assistant/assistant/bookmarkmodel.h
diff --git a/src/assistant/tools/assistant/bookmarkwidget.ui b/src/assistant/assistant/bookmarkwidget.ui
similarity index 100%
rename from src/assistant/tools/assistant/bookmarkwidget.ui
rename to src/assistant/assistant/bookmarkwidget.ui
diff --git a/src/assistant/tools/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
similarity index 99%
rename from src/assistant/tools/assistant/centralwidget.cpp
rename to src/assistant/assistant/centralwidget.cpp
index da27f033dedc394c4fa56d79f8d0839b1be91aea..5544dcb2462651cc68bdfbb749a2d7dd92313ed3 100644
--- a/src/assistant/tools/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -52,10 +52,10 @@
 
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QPageSetupDialog>
-#include <QtWidgets/QPrintDialog>
-#include <QtWidgets/QPrintPreviewDialog>
-#include <QtGui/QPrinter>
+#include <QtPrintSupport/QPageSetupDialog>
+#include <QtPrintSupport/QPrintDialog>
+#include <QtPrintSupport/QPrintPreviewDialog>
+#include <QtPrintSupport/QPrinter>
 #include <QtWidgets/QStackedWidget>
 #include <QtWidgets/QTextBrowser>
 #include <QtWidgets/QVBoxLayout>
diff --git a/src/assistant/tools/assistant/centralwidget.h b/src/assistant/assistant/centralwidget.h
similarity index 99%
rename from src/assistant/tools/assistant/centralwidget.h
rename to src/assistant/assistant/centralwidget.h
index cdf132a1f5bb0c793fa496f1df6499e61d37eb31..da8a799c86a151a744a91093490c64d8d70f9a84 100644
--- a/src/assistant/tools/assistant/centralwidget.h
+++ b/src/assistant/assistant/centralwidget.h
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 class FindWidget;
 class HelpViewer;
 class QStackedWidget;
+class QPrinter;
 
 class TabBar : public QTabBar
 {
diff --git a/src/assistant/tools/assistant/cmdlineparser.cpp b/src/assistant/assistant/cmdlineparser.cpp
similarity index 100%
rename from src/assistant/tools/assistant/cmdlineparser.cpp
rename to src/assistant/assistant/cmdlineparser.cpp
diff --git a/src/assistant/tools/assistant/cmdlineparser.h b/src/assistant/assistant/cmdlineparser.h
similarity index 100%
rename from src/assistant/tools/assistant/cmdlineparser.h
rename to src/assistant/assistant/cmdlineparser.h
diff --git a/src/assistant/tools/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp
similarity index 100%
rename from src/assistant/tools/assistant/contentwindow.cpp
rename to src/assistant/assistant/contentwindow.cpp
diff --git a/src/assistant/tools/assistant/contentwindow.h b/src/assistant/assistant/contentwindow.h
similarity index 100%
rename from src/assistant/tools/assistant/contentwindow.h
rename to src/assistant/assistant/contentwindow.h
diff --git a/src/assistant/tools/assistant/doc/HOWTO b/src/assistant/assistant/doc/HOWTO
similarity index 100%
rename from src/assistant/tools/assistant/doc/HOWTO
rename to src/assistant/assistant/doc/HOWTO
diff --git a/src/assistant/tools/assistant/doc/assistant.qdoc b/src/assistant/assistant/doc/assistant.qdoc
similarity index 100%
rename from src/assistant/tools/assistant/doc/assistant.qdoc
rename to src/assistant/assistant/doc/assistant.qdoc
diff --git a/src/assistant/tools/assistant/doc/assistant.qdocconf b/src/assistant/assistant/doc/assistant.qdocconf
similarity index 100%
rename from src/assistant/tools/assistant/doc/assistant.qdocconf
rename to src/assistant/assistant/doc/assistant.qdocconf
diff --git a/src/assistant/tools/assistant/doc/assistant.qhp b/src/assistant/assistant/doc/assistant.qhp
similarity index 100%
rename from src/assistant/tools/assistant/doc/assistant.qhp
rename to src/assistant/assistant/doc/assistant.qhp
diff --git a/src/assistant/tools/assistant/doc/classic.css b/src/assistant/assistant/doc/classic.css
similarity index 100%
rename from src/assistant/tools/assistant/doc/classic.css
rename to src/assistant/assistant/doc/classic.css
diff --git a/src/assistant/tools/assistant/doc/images/assistant-address-toolbar.png b/src/assistant/assistant/doc/images/assistant-address-toolbar.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-address-toolbar.png
rename to src/assistant/assistant/doc/images/assistant-address-toolbar.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-assistant.png b/src/assistant/assistant/doc/images/assistant-assistant.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-assistant.png
rename to src/assistant/assistant/doc/images/assistant-assistant.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-dockwidgets.png b/src/assistant/assistant/doc/images/assistant-dockwidgets.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-dockwidgets.png
rename to src/assistant/assistant/doc/images/assistant-dockwidgets.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-docwindow.png b/src/assistant/assistant/doc/images/assistant-docwindow.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-docwindow.png
rename to src/assistant/assistant/doc/images/assistant-docwindow.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-examples.png b/src/assistant/assistant/doc/images/assistant-examples.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-examples.png
rename to src/assistant/assistant/doc/images/assistant-examples.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-filter-toolbar.png b/src/assistant/assistant/doc/images/assistant-filter-toolbar.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-filter-toolbar.png
rename to src/assistant/assistant/doc/images/assistant-filter-toolbar.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-documentation.png b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-preferences-documentation.png
rename to src/assistant/assistant/doc/images/assistant-preferences-documentation.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-filters.png b/src/assistant/assistant/doc/images/assistant-preferences-filters.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-preferences-filters.png
rename to src/assistant/assistant/doc/images/assistant-preferences-filters.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-fonts.png b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-preferences-fonts.png
rename to src/assistant/assistant/doc/images/assistant-preferences-fonts.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-preferences-options.png b/src/assistant/assistant/doc/images/assistant-preferences-options.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-preferences-options.png
rename to src/assistant/assistant/doc/images/assistant-preferences-options.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-search.png b/src/assistant/assistant/doc/images/assistant-search.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-search.png
rename to src/assistant/assistant/doc/images/assistant-search.png
diff --git a/src/assistant/tools/assistant/doc/images/assistant-toolbar.png b/src/assistant/assistant/doc/images/assistant-toolbar.png
similarity index 100%
rename from src/assistant/tools/assistant/doc/images/assistant-toolbar.png
rename to src/assistant/assistant/doc/images/assistant-toolbar.png
diff --git a/src/assistant/tools/assistant/filternamedialog.cpp b/src/assistant/assistant/filternamedialog.cpp
similarity index 100%
rename from src/assistant/tools/assistant/filternamedialog.cpp
rename to src/assistant/assistant/filternamedialog.cpp
diff --git a/src/assistant/tools/assistant/filternamedialog.h b/src/assistant/assistant/filternamedialog.h
similarity index 100%
rename from src/assistant/tools/assistant/filternamedialog.h
rename to src/assistant/assistant/filternamedialog.h
diff --git a/src/assistant/tools/assistant/filternamedialog.ui b/src/assistant/assistant/filternamedialog.ui
similarity index 100%
rename from src/assistant/tools/assistant/filternamedialog.ui
rename to src/assistant/assistant/filternamedialog.ui
diff --git a/src/assistant/tools/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp
similarity index 100%
rename from src/assistant/tools/assistant/findwidget.cpp
rename to src/assistant/assistant/findwidget.cpp
diff --git a/src/assistant/tools/assistant/findwidget.h b/src/assistant/assistant/findwidget.h
similarity index 100%
rename from src/assistant/tools/assistant/findwidget.h
rename to src/assistant/assistant/findwidget.h
diff --git a/src/assistant/tools/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
similarity index 100%
rename from src/assistant/tools/assistant/globalactions.cpp
rename to src/assistant/assistant/globalactions.cpp
diff --git a/src/assistant/tools/assistant/globalactions.h b/src/assistant/assistant/globalactions.h
similarity index 100%
rename from src/assistant/tools/assistant/globalactions.h
rename to src/assistant/assistant/globalactions.h
diff --git a/src/assistant/tools/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp
similarity index 100%
rename from src/assistant/tools/assistant/helpenginewrapper.cpp
rename to src/assistant/assistant/helpenginewrapper.cpp
diff --git a/src/assistant/tools/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h
similarity index 100%
rename from src/assistant/tools/assistant/helpenginewrapper.h
rename to src/assistant/assistant/helpenginewrapper.h
diff --git a/src/assistant/tools/assistant/helpviewer.cpp b/src/assistant/assistant/helpviewer.cpp
similarity index 100%
rename from src/assistant/tools/assistant/helpviewer.cpp
rename to src/assistant/assistant/helpviewer.cpp
diff --git a/src/assistant/tools/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
similarity index 100%
rename from src/assistant/tools/assistant/helpviewer.h
rename to src/assistant/assistant/helpviewer.h
diff --git a/src/assistant/tools/assistant/helpviewer_p.h b/src/assistant/assistant/helpviewer_p.h
similarity index 100%
rename from src/assistant/tools/assistant/helpviewer_p.h
rename to src/assistant/assistant/helpviewer_p.h
diff --git a/src/assistant/tools/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp
similarity index 100%
rename from src/assistant/tools/assistant/helpviewer_qtb.cpp
rename to src/assistant/assistant/helpviewer_qtb.cpp
diff --git a/src/assistant/tools/assistant/helpviewer_qwv.cpp b/src/assistant/assistant/helpviewer_qwv.cpp
similarity index 100%
rename from src/assistant/tools/assistant/helpviewer_qwv.cpp
rename to src/assistant/assistant/helpviewer_qwv.cpp
diff --git a/src/assistant/tools/assistant/images/assistant-128.png b/src/assistant/assistant/images/assistant-128.png
similarity index 100%
rename from src/assistant/tools/assistant/images/assistant-128.png
rename to src/assistant/assistant/images/assistant-128.png
diff --git a/src/assistant/tools/assistant/images/assistant.png b/src/assistant/assistant/images/assistant.png
similarity index 100%
rename from src/assistant/tools/assistant/images/assistant.png
rename to src/assistant/assistant/images/assistant.png
diff --git a/src/assistant/tools/assistant/images/bookmark.png b/src/assistant/assistant/images/bookmark.png
similarity index 100%
rename from src/assistant/tools/assistant/images/bookmark.png
rename to src/assistant/assistant/images/bookmark.png
diff --git a/src/assistant/tools/assistant/images/closebutton.png b/src/assistant/assistant/images/closebutton.png
similarity index 100%
rename from src/assistant/tools/assistant/images/closebutton.png
rename to src/assistant/assistant/images/closebutton.png
diff --git a/src/assistant/tools/assistant/images/darkclosebutton.png b/src/assistant/assistant/images/darkclosebutton.png
similarity index 100%
rename from src/assistant/tools/assistant/images/darkclosebutton.png
rename to src/assistant/assistant/images/darkclosebutton.png
diff --git a/src/assistant/tools/assistant/images/mac/addtab.png b/src/assistant/assistant/images/mac/addtab.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/addtab.png
rename to src/assistant/assistant/images/mac/addtab.png
diff --git a/src/assistant/tools/assistant/images/mac/book.png b/src/assistant/assistant/images/mac/book.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/book.png
rename to src/assistant/assistant/images/mac/book.png
diff --git a/src/assistant/tools/assistant/images/mac/closetab.png b/src/assistant/assistant/images/mac/closetab.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/closetab.png
rename to src/assistant/assistant/images/mac/closetab.png
diff --git a/src/assistant/tools/assistant/images/mac/editcopy.png b/src/assistant/assistant/images/mac/editcopy.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/editcopy.png
rename to src/assistant/assistant/images/mac/editcopy.png
diff --git a/src/assistant/tools/assistant/images/mac/find.png b/src/assistant/assistant/images/mac/find.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/find.png
rename to src/assistant/assistant/images/mac/find.png
diff --git a/src/assistant/tools/assistant/images/mac/home.png b/src/assistant/assistant/images/mac/home.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/home.png
rename to src/assistant/assistant/images/mac/home.png
diff --git a/src/assistant/tools/assistant/images/mac/next.png b/src/assistant/assistant/images/mac/next.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/next.png
rename to src/assistant/assistant/images/mac/next.png
diff --git a/src/assistant/tools/assistant/images/mac/previous.png b/src/assistant/assistant/images/mac/previous.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/previous.png
rename to src/assistant/assistant/images/mac/previous.png
diff --git a/src/assistant/tools/assistant/images/mac/print.png b/src/assistant/assistant/images/mac/print.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/print.png
rename to src/assistant/assistant/images/mac/print.png
diff --git a/src/assistant/tools/assistant/images/mac/resetzoom.png b/src/assistant/assistant/images/mac/resetzoom.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/resetzoom.png
rename to src/assistant/assistant/images/mac/resetzoom.png
diff --git a/src/assistant/tools/assistant/images/mac/synctoc.png b/src/assistant/assistant/images/mac/synctoc.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/synctoc.png
rename to src/assistant/assistant/images/mac/synctoc.png
diff --git a/src/assistant/tools/assistant/images/mac/zoomin.png b/src/assistant/assistant/images/mac/zoomin.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/zoomin.png
rename to src/assistant/assistant/images/mac/zoomin.png
diff --git a/src/assistant/tools/assistant/images/mac/zoomout.png b/src/assistant/assistant/images/mac/zoomout.png
similarity index 100%
rename from src/assistant/tools/assistant/images/mac/zoomout.png
rename to src/assistant/assistant/images/mac/zoomout.png
diff --git a/src/assistant/tools/assistant/images/trolltech-logo.png b/src/assistant/assistant/images/trolltech-logo.png
similarity index 100%
rename from src/assistant/tools/assistant/images/trolltech-logo.png
rename to src/assistant/assistant/images/trolltech-logo.png
diff --git a/src/assistant/tools/assistant/images/win/addtab.png b/src/assistant/assistant/images/win/addtab.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/addtab.png
rename to src/assistant/assistant/images/win/addtab.png
diff --git a/src/assistant/tools/assistant/images/win/book.png b/src/assistant/assistant/images/win/book.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/book.png
rename to src/assistant/assistant/images/win/book.png
diff --git a/src/assistant/tools/assistant/images/win/closetab.png b/src/assistant/assistant/images/win/closetab.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/closetab.png
rename to src/assistant/assistant/images/win/closetab.png
diff --git a/src/assistant/tools/assistant/images/win/editcopy.png b/src/assistant/assistant/images/win/editcopy.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/editcopy.png
rename to src/assistant/assistant/images/win/editcopy.png
diff --git a/src/assistant/tools/assistant/images/win/find.png b/src/assistant/assistant/images/win/find.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/find.png
rename to src/assistant/assistant/images/win/find.png
diff --git a/src/assistant/tools/assistant/images/win/home.png b/src/assistant/assistant/images/win/home.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/home.png
rename to src/assistant/assistant/images/win/home.png
diff --git a/src/assistant/tools/assistant/images/win/next.png b/src/assistant/assistant/images/win/next.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/next.png
rename to src/assistant/assistant/images/win/next.png
diff --git a/src/assistant/tools/assistant/images/win/previous.png b/src/assistant/assistant/images/win/previous.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/previous.png
rename to src/assistant/assistant/images/win/previous.png
diff --git a/src/assistant/tools/assistant/images/win/print.png b/src/assistant/assistant/images/win/print.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/print.png
rename to src/assistant/assistant/images/win/print.png
diff --git a/src/assistant/tools/assistant/images/win/resetzoom.png b/src/assistant/assistant/images/win/resetzoom.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/resetzoom.png
rename to src/assistant/assistant/images/win/resetzoom.png
diff --git a/src/assistant/tools/assistant/images/win/synctoc.png b/src/assistant/assistant/images/win/synctoc.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/synctoc.png
rename to src/assistant/assistant/images/win/synctoc.png
diff --git a/src/assistant/tools/assistant/images/win/zoomin.png b/src/assistant/assistant/images/win/zoomin.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/zoomin.png
rename to src/assistant/assistant/images/win/zoomin.png
diff --git a/src/assistant/tools/assistant/images/win/zoomout.png b/src/assistant/assistant/images/win/zoomout.png
similarity index 100%
rename from src/assistant/tools/assistant/images/win/zoomout.png
rename to src/assistant/assistant/images/win/zoomout.png
diff --git a/src/assistant/tools/assistant/images/wrap.png b/src/assistant/assistant/images/wrap.png
similarity index 100%
rename from src/assistant/tools/assistant/images/wrap.png
rename to src/assistant/assistant/images/wrap.png
diff --git a/src/assistant/tools/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
similarity index 100%
rename from src/assistant/tools/assistant/indexwindow.cpp
rename to src/assistant/assistant/indexwindow.cpp
diff --git a/src/assistant/tools/assistant/indexwindow.h b/src/assistant/assistant/indexwindow.h
similarity index 100%
rename from src/assistant/tools/assistant/indexwindow.h
rename to src/assistant/assistant/indexwindow.h
diff --git a/src/assistant/tools/assistant/installdialog.cpp b/src/assistant/assistant/installdialog.cpp
similarity index 100%
rename from src/assistant/tools/assistant/installdialog.cpp
rename to src/assistant/assistant/installdialog.cpp
diff --git a/src/assistant/tools/assistant/installdialog.h b/src/assistant/assistant/installdialog.h
similarity index 100%
rename from src/assistant/tools/assistant/installdialog.h
rename to src/assistant/assistant/installdialog.h
diff --git a/src/assistant/tools/assistant/installdialog.ui b/src/assistant/assistant/installdialog.ui
similarity index 100%
rename from src/assistant/tools/assistant/installdialog.ui
rename to src/assistant/assistant/installdialog.ui
diff --git a/src/assistant/tools/assistant/main.cpp b/src/assistant/assistant/main.cpp
similarity index 100%
rename from src/assistant/tools/assistant/main.cpp
rename to src/assistant/assistant/main.cpp
diff --git a/src/assistant/tools/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
similarity index 100%
rename from src/assistant/tools/assistant/mainwindow.cpp
rename to src/assistant/assistant/mainwindow.cpp
diff --git a/src/assistant/tools/assistant/mainwindow.h b/src/assistant/assistant/mainwindow.h
similarity index 100%
rename from src/assistant/tools/assistant/mainwindow.h
rename to src/assistant/assistant/mainwindow.h
diff --git a/src/assistant/tools/assistant/openpagesmanager.cpp b/src/assistant/assistant/openpagesmanager.cpp
similarity index 100%
rename from src/assistant/tools/assistant/openpagesmanager.cpp
rename to src/assistant/assistant/openpagesmanager.cpp
diff --git a/src/assistant/tools/assistant/openpagesmanager.h b/src/assistant/assistant/openpagesmanager.h
similarity index 100%
rename from src/assistant/tools/assistant/openpagesmanager.h
rename to src/assistant/assistant/openpagesmanager.h
diff --git a/src/assistant/tools/assistant/openpagesmodel.cpp b/src/assistant/assistant/openpagesmodel.cpp
similarity index 100%
rename from src/assistant/tools/assistant/openpagesmodel.cpp
rename to src/assistant/assistant/openpagesmodel.cpp
diff --git a/src/assistant/tools/assistant/openpagesmodel.h b/src/assistant/assistant/openpagesmodel.h
similarity index 100%
rename from src/assistant/tools/assistant/openpagesmodel.h
rename to src/assistant/assistant/openpagesmodel.h
diff --git a/src/assistant/tools/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp
similarity index 100%
rename from src/assistant/tools/assistant/openpagesswitcher.cpp
rename to src/assistant/assistant/openpagesswitcher.cpp
diff --git a/src/assistant/tools/assistant/openpagesswitcher.h b/src/assistant/assistant/openpagesswitcher.h
similarity index 100%
rename from src/assistant/tools/assistant/openpagesswitcher.h
rename to src/assistant/assistant/openpagesswitcher.h
diff --git a/src/assistant/tools/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp
similarity index 100%
rename from src/assistant/tools/assistant/openpageswidget.cpp
rename to src/assistant/assistant/openpageswidget.cpp
diff --git a/src/assistant/tools/assistant/openpageswidget.h b/src/assistant/assistant/openpageswidget.h
similarity index 100%
rename from src/assistant/tools/assistant/openpageswidget.h
rename to src/assistant/assistant/openpageswidget.h
diff --git a/src/assistant/tools/assistant/preferencesdialog.cpp b/src/assistant/assistant/preferencesdialog.cpp
similarity index 100%
rename from src/assistant/tools/assistant/preferencesdialog.cpp
rename to src/assistant/assistant/preferencesdialog.cpp
diff --git a/src/assistant/tools/assistant/preferencesdialog.h b/src/assistant/assistant/preferencesdialog.h
similarity index 100%
rename from src/assistant/tools/assistant/preferencesdialog.h
rename to src/assistant/assistant/preferencesdialog.h
diff --git a/src/assistant/tools/assistant/preferencesdialog.ui b/src/assistant/assistant/preferencesdialog.ui
similarity index 100%
rename from src/assistant/tools/assistant/preferencesdialog.ui
rename to src/assistant/assistant/preferencesdialog.ui
diff --git a/src/assistant/tools/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
similarity index 100%
rename from src/assistant/tools/assistant/qtdocinstaller.cpp
rename to src/assistant/assistant/qtdocinstaller.cpp
diff --git a/src/assistant/tools/assistant/qtdocinstaller.h b/src/assistant/assistant/qtdocinstaller.h
similarity index 100%
rename from src/assistant/tools/assistant/qtdocinstaller.h
rename to src/assistant/assistant/qtdocinstaller.h
diff --git a/src/assistant/tools/assistant/remotecontrol.cpp b/src/assistant/assistant/remotecontrol.cpp
similarity index 100%
rename from src/assistant/tools/assistant/remotecontrol.cpp
rename to src/assistant/assistant/remotecontrol.cpp
diff --git a/src/assistant/tools/assistant/remotecontrol.h b/src/assistant/assistant/remotecontrol.h
similarity index 100%
rename from src/assistant/tools/assistant/remotecontrol.h
rename to src/assistant/assistant/remotecontrol.h
diff --git a/src/assistant/tools/assistant/remotecontrol_win.h b/src/assistant/assistant/remotecontrol_win.h
similarity index 100%
rename from src/assistant/tools/assistant/remotecontrol_win.h
rename to src/assistant/assistant/remotecontrol_win.h
diff --git a/src/assistant/tools/assistant/searchwidget.cpp b/src/assistant/assistant/searchwidget.cpp
similarity index 100%
rename from src/assistant/tools/assistant/searchwidget.cpp
rename to src/assistant/assistant/searchwidget.cpp
diff --git a/src/assistant/tools/assistant/searchwidget.h b/src/assistant/assistant/searchwidget.h
similarity index 100%
rename from src/assistant/tools/assistant/searchwidget.h
rename to src/assistant/assistant/searchwidget.h
diff --git a/src/assistant/tools/assistant/topicchooser.cpp b/src/assistant/assistant/topicchooser.cpp
similarity index 100%
rename from src/assistant/tools/assistant/topicchooser.cpp
rename to src/assistant/assistant/topicchooser.cpp
diff --git a/src/assistant/tools/assistant/topicchooser.h b/src/assistant/assistant/topicchooser.h
similarity index 100%
rename from src/assistant/tools/assistant/topicchooser.h
rename to src/assistant/assistant/topicchooser.h
diff --git a/src/assistant/tools/assistant/topicchooser.ui b/src/assistant/assistant/topicchooser.ui
similarity index 100%
rename from src/assistant/tools/assistant/topicchooser.ui
rename to src/assistant/assistant/topicchooser.ui
diff --git a/src/assistant/tools/assistant/tracer.h b/src/assistant/assistant/tracer.h
similarity index 100%
rename from src/assistant/tools/assistant/tracer.h
rename to src/assistant/assistant/tracer.h
diff --git a/src/assistant/tools/assistant/xbelsupport.cpp b/src/assistant/assistant/xbelsupport.cpp
similarity index 100%
rename from src/assistant/tools/assistant/xbelsupport.cpp
rename to src/assistant/assistant/xbelsupport.cpp
diff --git a/src/assistant/tools/assistant/xbelsupport.h b/src/assistant/assistant/xbelsupport.h
similarity index 98%
rename from src/assistant/tools/assistant/xbelsupport.h
rename to src/assistant/assistant/xbelsupport.h
index 4c2a211ad9dc82658c31a6de4eb0d9c8c237d92e..f55d3ba82901da30ead5c1d4f2abdcb3139b7dc7 100644
--- a/src/assistant/tools/assistant/xbelsupport.h
+++ b/src/assistant/assistant/xbelsupport.h
@@ -42,7 +42,7 @@
 #ifndef XBELSUPPORT_H
 #define XBELSUPPORT_H
 
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 #include <QtCore/QPersistentModelIndex>
 
 QT_FORWARD_DECLARE_CLASS(QIODevice)
diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pro b/src/assistant/clucene/clucene.pro
similarity index 69%
rename from src/assistant/lib/fulltextsearch/fulltextsearch.pro
rename to src/assistant/clucene/clucene.pro
index 8733e57d7547c0d1cbbf15bdbec2039e22d02ff3..51ada580f93971d8e75aaa83d3fa9628f5af4786 100644
--- a/src/assistant/lib/fulltextsearch/fulltextsearch.pro
+++ b/src/assistant/clucene/clucene.pro
@@ -1,21 +1,16 @@
 load(qt_module)
 
-QMAKE_TARGET_PRODUCT = QtCLucene
-QMAKE_TARGET_DESCRIPTION = QtCLucene full text search library wrapper.
-#if qt is built with frameworks in debug, we must build QtCLucene in debug and release 
-#that's a similar logic as in qbase.pri 
-mac:!static:contains(QT_CONFIG, qt_framework) { 
-   CONFIG(debug, debug|release) { 
-      !build_pass:CONFIG += build_all 
-   } 
-}
-QT_CONFIG -= qt_framework 
-QT -= gui
-TEMPLATE = lib
 TARGET = QtCLucene
+QPRO_PWD = $$PWD
+
+CONFIG += module
+MODULE_PRI = ../../../modules/qt_clucene.pri
+
+QT = core
+
 DEFINES += QHELP_LIB
-include($$QT_SOURCE_TREE/src/qbase.pri)
 
+load(qt_module_config)
 HEADERS += qtcluceneversion.h
 
 include(fulltextsearch.pri)
diff --git a/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/src/assistant/clucene/fulltextsearch.pri
similarity index 99%
rename from src/assistant/lib/fulltextsearch/fulltextsearch.pri
rename to src/assistant/clucene/fulltextsearch.pri
index aac2ec6eb141adfd0238d10091da6243bdb76558..eebfba33ac04a75ba981002c00897aa99bbcad6c 100644
--- a/src/assistant/lib/fulltextsearch/fulltextsearch.pri
+++ b/src/assistant/clucene/fulltextsearch.pri
@@ -1,7 +1,7 @@
 DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING
 win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT
 
-CLUCENEDIR = ../../../../3rdparty/clucene/src/CLucene
+CLUCENEDIR = ../3rdparty/clucene/src/CLucene
 
 INCLUDEPATH += . .. \
                $$CLUCENEDIR \
diff --git a/src/assistant/lib/fulltextsearch/license.txt b/src/assistant/clucene/license.txt
similarity index 100%
rename from src/assistant/lib/fulltextsearch/license.txt
rename to src/assistant/clucene/license.txt
diff --git a/src/assistant/lib/fulltextsearch/qanalyzer.cpp b/src/assistant/clucene/qanalyzer.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qanalyzer.cpp
rename to src/assistant/clucene/qanalyzer.cpp
diff --git a/src/assistant/lib/fulltextsearch/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qanalyzer_p.h
rename to src/assistant/clucene/qanalyzer_p.h
diff --git a/src/assistant/lib/fulltextsearch/qclucene-config_p.h b/src/assistant/clucene/qclucene-config_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qclucene-config_p.h
rename to src/assistant/clucene/qclucene-config_p.h
diff --git a/src/assistant/lib/fulltextsearch/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qclucene_global_p.h
rename to src/assistant/clucene/qclucene_global_p.h
diff --git a/src/assistant/lib/fulltextsearch/qdocument.cpp b/src/assistant/clucene/qdocument.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qdocument.cpp
rename to src/assistant/clucene/qdocument.cpp
diff --git a/src/assistant/lib/fulltextsearch/qdocument_p.h b/src/assistant/clucene/qdocument_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qdocument_p.h
rename to src/assistant/clucene/qdocument_p.h
diff --git a/src/assistant/lib/fulltextsearch/qfield.cpp b/src/assistant/clucene/qfield.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qfield.cpp
rename to src/assistant/clucene/qfield.cpp
diff --git a/src/assistant/lib/fulltextsearch/qfield_p.h b/src/assistant/clucene/qfield_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qfield_p.h
rename to src/assistant/clucene/qfield_p.h
diff --git a/src/assistant/lib/fulltextsearch/qfilter.cpp b/src/assistant/clucene/qfilter.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qfilter.cpp
rename to src/assistant/clucene/qfilter.cpp
diff --git a/src/assistant/lib/fulltextsearch/qfilter_p.h b/src/assistant/clucene/qfilter_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qfilter_p.h
rename to src/assistant/clucene/qfilter_p.h
diff --git a/src/assistant/lib/fulltextsearch/qhits.cpp b/src/assistant/clucene/qhits.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qhits.cpp
rename to src/assistant/clucene/qhits.cpp
diff --git a/src/assistant/lib/fulltextsearch/qhits_p.h b/src/assistant/clucene/qhits_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qhits_p.h
rename to src/assistant/clucene/qhits_p.h
diff --git a/src/assistant/lib/fulltextsearch/qindexreader.cpp b/src/assistant/clucene/qindexreader.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qindexreader.cpp
rename to src/assistant/clucene/qindexreader.cpp
diff --git a/src/assistant/lib/fulltextsearch/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qindexreader_p.h
rename to src/assistant/clucene/qindexreader_p.h
diff --git a/src/assistant/lib/fulltextsearch/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qindexwriter.cpp
rename to src/assistant/clucene/qindexwriter.cpp
diff --git a/src/assistant/lib/fulltextsearch/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qindexwriter_p.h
rename to src/assistant/clucene/qindexwriter_p.h
diff --git a/src/assistant/lib/fulltextsearch/qquery.cpp b/src/assistant/clucene/qquery.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qquery.cpp
rename to src/assistant/clucene/qquery.cpp
diff --git a/src/assistant/lib/fulltextsearch/qquery_p.h b/src/assistant/clucene/qquery_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qquery_p.h
rename to src/assistant/clucene/qquery_p.h
diff --git a/src/assistant/lib/fulltextsearch/qqueryparser.cpp b/src/assistant/clucene/qqueryparser.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qqueryparser.cpp
rename to src/assistant/clucene/qqueryparser.cpp
diff --git a/src/assistant/lib/fulltextsearch/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qqueryparser_p.h
rename to src/assistant/clucene/qqueryparser_p.h
diff --git a/src/assistant/lib/fulltextsearch/qreader.cpp b/src/assistant/clucene/qreader.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qreader.cpp
rename to src/assistant/clucene/qreader.cpp
diff --git a/src/assistant/lib/fulltextsearch/qreader_p.h b/src/assistant/clucene/qreader_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qreader_p.h
rename to src/assistant/clucene/qreader_p.h
diff --git a/src/assistant/lib/fulltextsearch/qsearchable.cpp b/src/assistant/clucene/qsearchable.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qsearchable.cpp
rename to src/assistant/clucene/qsearchable.cpp
diff --git a/src/assistant/lib/fulltextsearch/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qsearchable_p.h
rename to src/assistant/clucene/qsearchable_p.h
diff --git a/src/assistant/lib/fulltextsearch/qsort.cpp b/src/assistant/clucene/qsort.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qsort.cpp
rename to src/assistant/clucene/qsort.cpp
diff --git a/src/assistant/lib/fulltextsearch/qsort_p.h b/src/assistant/clucene/qsort_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qsort_p.h
rename to src/assistant/clucene/qsort_p.h
diff --git a/src/assistant/lib/fulltextsearch/qterm.cpp b/src/assistant/clucene/qterm.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qterm.cpp
rename to src/assistant/clucene/qterm.cpp
diff --git a/src/assistant/lib/fulltextsearch/qterm_p.h b/src/assistant/clucene/qterm_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qterm_p.h
rename to src/assistant/clucene/qterm_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtoken.cpp b/src/assistant/clucene/qtoken.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtoken.cpp
rename to src/assistant/clucene/qtoken.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtoken_p.h b/src/assistant/clucene/qtoken_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtoken_p.h
rename to src/assistant/clucene/qtoken_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtokenizer.cpp b/src/assistant/clucene/qtokenizer.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtokenizer.cpp
rename to src/assistant/clucene/qtokenizer.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtokenizer_p.h b/src/assistant/clucene/qtokenizer_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtokenizer_p.h
rename to src/assistant/clucene/qtokenizer_p.h
diff --git a/src/assistant/lib/fulltextsearch/qtokenstream.cpp b/src/assistant/clucene/qtokenstream.cpp
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtokenstream.cpp
rename to src/assistant/clucene/qtokenstream.cpp
diff --git a/src/assistant/lib/fulltextsearch/qtokenstream_p.h b/src/assistant/clucene/qtokenstream_p.h
similarity index 100%
rename from src/assistant/lib/fulltextsearch/qtokenstream_p.h
rename to src/assistant/clucene/qtokenstream_p.h
diff --git a/src/assistant/lib/lib.pro b/src/assistant/help/help.pro
similarity index 81%
rename from src/assistant/lib/lib.pro
rename to src/assistant/help/help.pro
index 280c77915a81a2de2c86cdbc98814ca6b7ac3c43..2aa30992ef1e19949eb28cb7535c83a2a614e32d 100644
--- a/src/assistant/lib/lib.pro
+++ b/src/assistant/help/help.pro
@@ -1,39 +1,28 @@
 load(qt_module)
 
-QT += widgets \
-    sql \
-    xml \
-    network \
-    core-private
-TEMPLATE = lib
 TARGET = QtHelp
+QPRO_PWD = $$PWD
+QT += widgets sql network core-private clucene clucene-private
 
 CONFIG += module
 MODULE_PRI += ../../../modules/qt_help.pri
 
-DEFINES += QHELP_LIB \
-    QT_CLUCENE_SUPPORT
-CONFIG += qt \
-    warn_on
-include($$QT_SOURCE_TREE/src/qbase.pri)
+DEFINES += QHELP_LIB QT_CLUCENE_SUPPORT
+
+load(qt_module_config)
 
 HEADERS += qthelpversion.h
 
-QMAKE_TARGET_PRODUCT = Help
-QMAKE_TARGET_DESCRIPTION = Help \
-    application \
-    framework.
 DEFINES -= QT_ASCII_CAST_WARNINGS
-INCLUDEPATH += $$QT.help.includes
+
 qclucene = QtCLucene$${QT_LIBINFIX}
 if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { 
     mac:qclucene = $${qclucene}_debug
     win32:qclucene = $${qclucene}d
 }
 linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \
-    QtSql \
-    QtXml
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql 
+
 LIBS_PRIVATE += -l$$qclucene
 RESOURCES += helpsystem.qrc
 SOURCES += qhelpenginecore.cpp \
diff --git a/src/assistant/lib/helpsystem.qrc b/src/assistant/help/helpsystem.qrc
similarity index 100%
rename from src/assistant/lib/helpsystem.qrc
rename to src/assistant/help/helpsystem.qrc
diff --git a/src/assistant/lib/images/1leftarrow.png b/src/assistant/help/images/1leftarrow.png
similarity index 100%
rename from src/assistant/lib/images/1leftarrow.png
rename to src/assistant/help/images/1leftarrow.png
diff --git a/src/assistant/lib/images/1rightarrow.png b/src/assistant/help/images/1rightarrow.png
similarity index 100%
rename from src/assistant/lib/images/1rightarrow.png
rename to src/assistant/help/images/1rightarrow.png
diff --git a/src/assistant/lib/images/3leftarrow.png b/src/assistant/help/images/3leftarrow.png
similarity index 100%
rename from src/assistant/lib/images/3leftarrow.png
rename to src/assistant/help/images/3leftarrow.png
diff --git a/src/assistant/lib/images/3rightarrow.png b/src/assistant/help/images/3rightarrow.png
similarity index 100%
rename from src/assistant/lib/images/3rightarrow.png
rename to src/assistant/help/images/3rightarrow.png
diff --git a/src/assistant/lib/qclucenefieldnames.cpp b/src/assistant/help/qclucenefieldnames.cpp
similarity index 100%
rename from src/assistant/lib/qclucenefieldnames.cpp
rename to src/assistant/help/qclucenefieldnames.cpp
diff --git a/src/assistant/lib/qclucenefieldnames_p.h b/src/assistant/help/qclucenefieldnames_p.h
similarity index 100%
rename from src/assistant/lib/qclucenefieldnames_p.h
rename to src/assistant/help/qclucenefieldnames_p.h
diff --git a/src/assistant/lib/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp
similarity index 100%
rename from src/assistant/lib/qhelp_global.cpp
rename to src/assistant/help/qhelp_global.cpp
diff --git a/src/assistant/lib/qhelp_global.h b/src/assistant/help/qhelp_global.h
similarity index 100%
rename from src/assistant/lib/qhelp_global.h
rename to src/assistant/help/qhelp_global.h
diff --git a/src/assistant/lib/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
similarity index 100%
rename from src/assistant/lib/qhelpcollectionhandler.cpp
rename to src/assistant/help/qhelpcollectionhandler.cpp
diff --git a/src/assistant/lib/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h
similarity index 100%
rename from src/assistant/lib/qhelpcollectionhandler_p.h
rename to src/assistant/help/qhelpcollectionhandler_p.h
diff --git a/src/assistant/lib/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
similarity index 100%
rename from src/assistant/lib/qhelpcontentwidget.cpp
rename to src/assistant/help/qhelpcontentwidget.cpp
diff --git a/src/assistant/lib/qhelpcontentwidget.h b/src/assistant/help/qhelpcontentwidget.h
similarity index 100%
rename from src/assistant/lib/qhelpcontentwidget.h
rename to src/assistant/help/qhelpcontentwidget.h
diff --git a/src/assistant/lib/qhelpdatainterface.cpp b/src/assistant/help/qhelpdatainterface.cpp
similarity index 100%
rename from src/assistant/lib/qhelpdatainterface.cpp
rename to src/assistant/help/qhelpdatainterface.cpp
diff --git a/src/assistant/lib/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h
similarity index 100%
rename from src/assistant/lib/qhelpdatainterface_p.h
rename to src/assistant/help/qhelpdatainterface_p.h
diff --git a/src/assistant/lib/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp
similarity index 100%
rename from src/assistant/lib/qhelpdbreader.cpp
rename to src/assistant/help/qhelpdbreader.cpp
diff --git a/src/assistant/lib/qhelpdbreader_p.h b/src/assistant/help/qhelpdbreader_p.h
similarity index 100%
rename from src/assistant/lib/qhelpdbreader_p.h
rename to src/assistant/help/qhelpdbreader_p.h
diff --git a/src/assistant/lib/qhelpengine.cpp b/src/assistant/help/qhelpengine.cpp
similarity index 100%
rename from src/assistant/lib/qhelpengine.cpp
rename to src/assistant/help/qhelpengine.cpp
diff --git a/src/assistant/lib/qhelpengine.h b/src/assistant/help/qhelpengine.h
similarity index 100%
rename from src/assistant/lib/qhelpengine.h
rename to src/assistant/help/qhelpengine.h
diff --git a/src/assistant/lib/qhelpengine_p.h b/src/assistant/help/qhelpengine_p.h
similarity index 100%
rename from src/assistant/lib/qhelpengine_p.h
rename to src/assistant/help/qhelpengine_p.h
diff --git a/src/assistant/lib/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp
similarity index 100%
rename from src/assistant/lib/qhelpenginecore.cpp
rename to src/assistant/help/qhelpenginecore.cpp
diff --git a/src/assistant/lib/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h
similarity index 100%
rename from src/assistant/lib/qhelpenginecore.h
rename to src/assistant/help/qhelpenginecore.h
diff --git a/src/assistant/lib/qhelpgenerator.cpp b/src/assistant/help/qhelpgenerator.cpp
similarity index 100%
rename from src/assistant/lib/qhelpgenerator.cpp
rename to src/assistant/help/qhelpgenerator.cpp
diff --git a/src/assistant/lib/qhelpgenerator_p.h b/src/assistant/help/qhelpgenerator_p.h
similarity index 100%
rename from src/assistant/lib/qhelpgenerator_p.h
rename to src/assistant/help/qhelpgenerator_p.h
diff --git a/src/assistant/lib/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
similarity index 100%
rename from src/assistant/lib/qhelpindexwidget.cpp
rename to src/assistant/help/qhelpindexwidget.cpp
diff --git a/src/assistant/lib/qhelpindexwidget.h b/src/assistant/help/qhelpindexwidget.h
similarity index 100%
rename from src/assistant/lib/qhelpindexwidget.h
rename to src/assistant/help/qhelpindexwidget.h
diff --git a/src/assistant/lib/qhelpprojectdata.cpp b/src/assistant/help/qhelpprojectdata.cpp
similarity index 99%
rename from src/assistant/lib/qhelpprojectdata.cpp
rename to src/assistant/help/qhelpprojectdata.cpp
index bd59e289c356f77669f6d653485cb2b1eb784f64..ce0ddd720cbb3723f520eb7b86688c49fd385d46 100644
--- a/src/assistant/lib/qhelpprojectdata.cpp
+++ b/src/assistant/help/qhelpprojectdata.cpp
@@ -49,7 +49,7 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QUrl>
 #include <QtCore/QVariant>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/assistant/lib/qhelpprojectdata_p.h b/src/assistant/help/qhelpprojectdata_p.h
similarity index 100%
rename from src/assistant/lib/qhelpprojectdata_p.h
rename to src/assistant/help/qhelpprojectdata_p.h
diff --git a/src/assistant/lib/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchengine.cpp
rename to src/assistant/help/qhelpsearchengine.cpp
diff --git a/src/assistant/lib/qhelpsearchengine.h b/src/assistant/help/qhelpsearchengine.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchengine.h
rename to src/assistant/help/qhelpsearchengine.h
diff --git a/src/assistant/lib/qhelpsearchindex_default.cpp b/src/assistant/help/qhelpsearchindex_default.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchindex_default.cpp
rename to src/assistant/help/qhelpsearchindex_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindex_default_p.h b/src/assistant/help/qhelpsearchindex_default_p.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchindex_default_p.h
rename to src/assistant/help/qhelpsearchindex_default_p.h
diff --git a/src/assistant/lib/qhelpsearchindexreader.cpp b/src/assistant/help/qhelpsearchindexreader.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexreader.cpp
rename to src/assistant/help/qhelpsearchindexreader.cpp
diff --git a/src/assistant/lib/qhelpsearchindexreader_clucene.cpp b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
similarity index 99%
rename from src/assistant/lib/qhelpsearchindexreader_clucene.cpp
rename to src/assistant/help/qhelpsearchindexreader_clucene.cpp
index 537e1d7658f95ea76e30c49271305b5c13228317..b67898f8a529a9eeebb88d2addec75806ac41e23 100644
--- a/src/assistant/lib/qhelpsearchindexreader_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_clucene.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qqueryparser_p.h"
-#include "fulltextsearch/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qqueryparser_p.h"
+#include "private/qsearchable_p.h"
 #include "qclucenefieldnames_p.h"
 #include "qhelpenginecore.h"
 
diff --git a/src/assistant/lib/qhelpsearchindexreader_clucene_p.h b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
similarity index 98%
rename from src/assistant/lib/qhelpsearchindexreader_clucene_p.h
rename to src/assistant/help/qhelpsearchindexreader_clucene_p.h
index dec18a07b63e5e018482dd6ac78dad6f36873c2b..1e3d199edf61d56a433c211609726d25a8be9685 100644
--- a/src/assistant/lib/qhelpsearchindexreader_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexreader_clucene_p.h
@@ -57,8 +57,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qquery_p.h"
 #include "qhelpsearchindexreader_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/lib/qhelpsearchindexreader_default.cpp b/src/assistant/help/qhelpsearchindexreader_default.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexreader_default.cpp
rename to src/assistant/help/qhelpsearchindexreader_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindexreader_default_p.h b/src/assistant/help/qhelpsearchindexreader_default_p.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexreader_default_p.h
rename to src/assistant/help/qhelpsearchindexreader_default_p.h
diff --git a/src/assistant/lib/qhelpsearchindexreader_p.h b/src/assistant/help/qhelpsearchindexreader_p.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexreader_p.h
rename to src/assistant/help/qhelpsearchindexreader_p.h
diff --git a/src/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
similarity index 98%
rename from src/assistant/lib/qhelpsearchindexwriter_clucene.cpp
rename to src/assistant/help/qhelpsearchindexwriter_clucene.cpp
index f3d5e4fc3b1bc3e9e55a0c8944881cacbca647df..2871513389c6e821e0d3955cfab02c9a76bb55a3 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene.cpp
@@ -42,13 +42,13 @@
 #include "qclucenefieldnames_p.h"
 #include "qhelpenginecore.h"
 #include "qhelp_global.h"
-#include "fulltextsearch/qhits_p.h"
-#include "fulltextsearch/qquery_p.h"
-#include "fulltextsearch/qanalyzer_p.h"
-#include "fulltextsearch/qdocument_p.h"
-#include "fulltextsearch/qsearchable_p.h"
-#include "fulltextsearch/qindexreader_p.h"
-#include "fulltextsearch/qindexwriter_p.h"
+#include "private/qhits_p.h"
+#include "private/qquery_p.h"
+#include "private/qanalyzer_p.h"
+#include "private/qdocument_p.h"
+#include "private/qsearchable_p.h"
+#include "private/qindexreader_p.h"
+#include "private/qindexwriter_p.h"
 #include "qhelpsearchindexwriter_clucene_p.h"
 
 #include <QtCore/QDir>
diff --git a/src/assistant/lib/qhelpsearchindexwriter_clucene_p.h b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
similarity index 98%
rename from src/assistant/lib/qhelpsearchindexwriter_clucene_p.h
rename to src/assistant/help/qhelpsearchindexwriter_clucene_p.h
index 89146f5a76a7d5855ec81df9b7f8f92d64b5f458..7c9a91468a12f3cbcf252020da3109df4f2338c4 100644
--- a/src/assistant/lib/qhelpsearchindexwriter_clucene_p.h
+++ b/src/assistant/help/qhelpsearchindexwriter_clucene_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qhelpenginecore.h"
-#include "fulltextsearch/qanalyzer_p.h"
+#include "private/qanalyzer_p.h"
 
 #include <QtCore/QUrl>
 #include <QtCore/QThread>
diff --git a/src/assistant/lib/qhelpsearchindexwriter_default.cpp b/src/assistant/help/qhelpsearchindexwriter_default.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexwriter_default.cpp
rename to src/assistant/help/qhelpsearchindexwriter_default.cpp
diff --git a/src/assistant/lib/qhelpsearchindexwriter_default_p.h b/src/assistant/help/qhelpsearchindexwriter_default_p.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchindexwriter_default_p.h
rename to src/assistant/help/qhelpsearchindexwriter_default_p.h
diff --git a/src/assistant/lib/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchquerywidget.cpp
rename to src/assistant/help/qhelpsearchquerywidget.cpp
diff --git a/src/assistant/lib/qhelpsearchquerywidget.h b/src/assistant/help/qhelpsearchquerywidget.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchquerywidget.h
rename to src/assistant/help/qhelpsearchquerywidget.h
diff --git a/src/assistant/lib/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
similarity index 100%
rename from src/assistant/lib/qhelpsearchresultwidget.cpp
rename to src/assistant/help/qhelpsearchresultwidget.cpp
diff --git a/src/assistant/lib/qhelpsearchresultwidget.h b/src/assistant/help/qhelpsearchresultwidget.h
similarity index 100%
rename from src/assistant/lib/qhelpsearchresultwidget.h
rename to src/assistant/help/qhelpsearchresultwidget.h
diff --git a/src/assistant/tools/qcollectiongenerator/main.cpp b/src/assistant/qcollectiongenerator/main.cpp
similarity index 99%
rename from src/assistant/tools/qcollectiongenerator/main.cpp
rename to src/assistant/qcollectiongenerator/main.cpp
index 058d4281a325c0bc7e9f4f1a214984bbaa68e563..87bdf7996cece83379c1bfb2135336cd1fa42c36 100644
--- a/src/assistant/tools/qcollectiongenerator/main.cpp
+++ b/src/assistant/qcollectiongenerator/main.cpp
@@ -55,7 +55,7 @@
 #include <QtCore/QLocale>
 #include <QtCore/QLibraryInfo>
 #include <QtHelp/QHelpEngineCore>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 
 QT_USE_NAMESPACE
diff --git a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
similarity index 89%
rename from src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
rename to src/assistant/qcollectiongenerator/qcollectiongenerator.pro
index 23d32c698569c4eab5b139acd58c894ab7bdc94c..e8df8e4f6fdc9a45f6cf5b021cbca097c0b25324 100644
--- a/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/src/assistant/qcollectiongenerator/qcollectiongenerator.pro
@@ -1,6 +1,4 @@
-QT += xml \
-    network \
-    help-private
+QT += network help-private
 TEMPLATE = app
 DESTDIR = $$QT.designer.bins
 TARGET = qcollectiongenerator
diff --git a/src/assistant/tools/qhelpconverter/adpreader.cpp b/src/assistant/qhelpconverter/adpreader.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/adpreader.cpp
rename to src/assistant/qhelpconverter/adpreader.cpp
diff --git a/src/assistant/tools/qhelpconverter/adpreader.h b/src/assistant/qhelpconverter/adpreader.h
similarity index 98%
rename from src/assistant/tools/qhelpconverter/adpreader.h
rename to src/assistant/qhelpconverter/adpreader.h
index f0b6ae214c846121ba0469ac88d0e2ac080a19c0..9900866c9d04eeed6ed6b0dcd62a4e31f64bf575 100644
--- a/src/assistant/tools/qhelpconverter/adpreader.h
+++ b/src/assistant/qhelpconverter/adpreader.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QSet>
-#include <QtXml/QXmlStreamReader>
+#include <QtCore/QXmlStreamReader>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/assistant/tools/qhelpconverter/assistant-128.png b/src/assistant/qhelpconverter/assistant-128.png
similarity index 100%
rename from src/assistant/tools/qhelpconverter/assistant-128.png
rename to src/assistant/qhelpconverter/assistant-128.png
diff --git a/src/assistant/tools/qhelpconverter/assistant.png b/src/assistant/qhelpconverter/assistant.png
similarity index 100%
rename from src/assistant/tools/qhelpconverter/assistant.png
rename to src/assistant/qhelpconverter/assistant.png
diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.cpp b/src/assistant/qhelpconverter/conversionwizard.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/conversionwizard.cpp
rename to src/assistant/qhelpconverter/conversionwizard.cpp
diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/conversionwizard.h
rename to src/assistant/qhelpconverter/conversionwizard.h
diff --git a/src/assistant/tools/qhelpconverter/doc/filespage.html b/src/assistant/qhelpconverter/doc/filespage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/filespage.html
rename to src/assistant/qhelpconverter/doc/filespage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/filterpage.html b/src/assistant/qhelpconverter/doc/filterpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/filterpage.html
rename to src/assistant/qhelpconverter/doc/filterpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/generalpage.html b/src/assistant/qhelpconverter/doc/generalpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/generalpage.html
rename to src/assistant/qhelpconverter/doc/generalpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/identifierpage.html b/src/assistant/qhelpconverter/doc/identifierpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/identifierpage.html
rename to src/assistant/qhelpconverter/doc/identifierpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/inputpage.html b/src/assistant/qhelpconverter/doc/inputpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/inputpage.html
rename to src/assistant/qhelpconverter/doc/inputpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/outputpage.html b/src/assistant/qhelpconverter/doc/outputpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/outputpage.html
rename to src/assistant/qhelpconverter/doc/outputpage.html
diff --git a/src/assistant/tools/qhelpconverter/doc/pathpage.html b/src/assistant/qhelpconverter/doc/pathpage.html
similarity index 100%
rename from src/assistant/tools/qhelpconverter/doc/pathpage.html
rename to src/assistant/qhelpconverter/doc/pathpage.html
diff --git a/src/assistant/tools/qhelpconverter/filespage.cpp b/src/assistant/qhelpconverter/filespage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filespage.cpp
rename to src/assistant/qhelpconverter/filespage.cpp
diff --git a/src/assistant/tools/qhelpconverter/filespage.h b/src/assistant/qhelpconverter/filespage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filespage.h
rename to src/assistant/qhelpconverter/filespage.h
diff --git a/src/assistant/tools/qhelpconverter/filespage.ui b/src/assistant/qhelpconverter/filespage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filespage.ui
rename to src/assistant/qhelpconverter/filespage.ui
diff --git a/src/assistant/tools/qhelpconverter/filterpage.cpp b/src/assistant/qhelpconverter/filterpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filterpage.cpp
rename to src/assistant/qhelpconverter/filterpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/filterpage.h b/src/assistant/qhelpconverter/filterpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filterpage.h
rename to src/assistant/qhelpconverter/filterpage.h
diff --git a/src/assistant/tools/qhelpconverter/filterpage.ui b/src/assistant/qhelpconverter/filterpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/filterpage.ui
rename to src/assistant/qhelpconverter/filterpage.ui
diff --git a/src/assistant/tools/qhelpconverter/finishpage.cpp b/src/assistant/qhelpconverter/finishpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/finishpage.cpp
rename to src/assistant/qhelpconverter/finishpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/finishpage.h b/src/assistant/qhelpconverter/finishpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/finishpage.h
rename to src/assistant/qhelpconverter/finishpage.h
diff --git a/src/assistant/tools/qhelpconverter/generalpage.cpp b/src/assistant/qhelpconverter/generalpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/generalpage.cpp
rename to src/assistant/qhelpconverter/generalpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/generalpage.h b/src/assistant/qhelpconverter/generalpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/generalpage.h
rename to src/assistant/qhelpconverter/generalpage.h
diff --git a/src/assistant/tools/qhelpconverter/generalpage.ui b/src/assistant/qhelpconverter/generalpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/generalpage.ui
rename to src/assistant/qhelpconverter/generalpage.ui
diff --git a/src/assistant/tools/qhelpconverter/helpwindow.cpp b/src/assistant/qhelpconverter/helpwindow.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/helpwindow.cpp
rename to src/assistant/qhelpconverter/helpwindow.cpp
diff --git a/src/assistant/tools/qhelpconverter/helpwindow.h b/src/assistant/qhelpconverter/helpwindow.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/helpwindow.h
rename to src/assistant/qhelpconverter/helpwindow.h
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.cpp b/src/assistant/qhelpconverter/identifierpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/identifierpage.cpp
rename to src/assistant/qhelpconverter/identifierpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.h b/src/assistant/qhelpconverter/identifierpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/identifierpage.h
rename to src/assistant/qhelpconverter/identifierpage.h
diff --git a/src/assistant/tools/qhelpconverter/identifierpage.ui b/src/assistant/qhelpconverter/identifierpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/identifierpage.ui
rename to src/assistant/qhelpconverter/identifierpage.ui
diff --git a/src/assistant/tools/qhelpconverter/inputpage.cpp b/src/assistant/qhelpconverter/inputpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/inputpage.cpp
rename to src/assistant/qhelpconverter/inputpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/inputpage.h
rename to src/assistant/qhelpconverter/inputpage.h
diff --git a/src/assistant/tools/qhelpconverter/inputpage.ui b/src/assistant/qhelpconverter/inputpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/inputpage.ui
rename to src/assistant/qhelpconverter/inputpage.ui
diff --git a/src/assistant/tools/qhelpconverter/main.cpp b/src/assistant/qhelpconverter/main.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/main.cpp
rename to src/assistant/qhelpconverter/main.cpp
diff --git a/src/assistant/tools/qhelpconverter/outputpage.cpp b/src/assistant/qhelpconverter/outputpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/outputpage.cpp
rename to src/assistant/qhelpconverter/outputpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/outputpage.h b/src/assistant/qhelpconverter/outputpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/outputpage.h
rename to src/assistant/qhelpconverter/outputpage.h
diff --git a/src/assistant/tools/qhelpconverter/outputpage.ui b/src/assistant/qhelpconverter/outputpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/outputpage.ui
rename to src/assistant/qhelpconverter/outputpage.ui
diff --git a/src/assistant/tools/qhelpconverter/pathpage.cpp b/src/assistant/qhelpconverter/pathpage.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/pathpage.cpp
rename to src/assistant/qhelpconverter/pathpage.cpp
diff --git a/src/assistant/tools/qhelpconverter/pathpage.h b/src/assistant/qhelpconverter/pathpage.h
similarity index 100%
rename from src/assistant/tools/qhelpconverter/pathpage.h
rename to src/assistant/qhelpconverter/pathpage.h
diff --git a/src/assistant/tools/qhelpconverter/pathpage.ui b/src/assistant/qhelpconverter/pathpage.ui
similarity index 100%
rename from src/assistant/tools/qhelpconverter/pathpage.ui
rename to src/assistant/qhelpconverter/pathpage.ui
diff --git a/src/assistant/tools/qhelpconverter/qhcpwriter.cpp b/src/assistant/qhelpconverter/qhcpwriter.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/qhcpwriter.cpp
rename to src/assistant/qhelpconverter/qhcpwriter.cpp
diff --git a/src/assistant/tools/qhelpconverter/qhcpwriter.h b/src/assistant/qhelpconverter/qhcpwriter.h
similarity index 98%
rename from src/assistant/tools/qhelpconverter/qhcpwriter.h
rename to src/assistant/qhelpconverter/qhcpwriter.h
index de0c6f8e1288596ae27bbd69e6d8a4cba03f89da..933d15a150b534f81642f795c97944eac58f1924 100644
--- a/src/assistant/tools/qhelpconverter/qhcpwriter.h
+++ b/src/assistant/qhelpconverter/qhcpwriter.h
@@ -42,7 +42,7 @@
 #ifndef QHCPWRITER_H
 #define QHCPWRITER_H
 
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
 #include "adpreader.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
similarity index 98%
rename from src/assistant/tools/qhelpconverter/qhelpconverter.pro
rename to src/assistant/qhelpconverter/qhelpconverter.pro
index f8754767d5a0b50d327f093a30bcee353a975100..712b16f614ac111c8021036a60449d355efbcaf5 100644
--- a/src/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -1,4 +1,4 @@
-QT += xml help
+QT += help
 TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = $$QT.designer.bins
diff --git a/src/assistant/tools/qhelpconverter/qhelpconverter.qrc b/src/assistant/qhelpconverter/qhelpconverter.qrc
similarity index 100%
rename from src/assistant/tools/qhelpconverter/qhelpconverter.qrc
rename to src/assistant/qhelpconverter/qhelpconverter.qrc
diff --git a/src/assistant/tools/qhelpconverter/qhpwriter.cpp b/src/assistant/qhelpconverter/qhpwriter.cpp
similarity index 100%
rename from src/assistant/tools/qhelpconverter/qhpwriter.cpp
rename to src/assistant/qhelpconverter/qhpwriter.cpp
diff --git a/src/assistant/tools/qhelpconverter/qhpwriter.h b/src/assistant/qhelpconverter/qhpwriter.h
similarity index 98%
rename from src/assistant/tools/qhelpconverter/qhpwriter.h
rename to src/assistant/qhelpconverter/qhpwriter.h
index 70fd04acaa99d1aae6854d02866c5134a4f05a6f..c118d4c9f46c0e8800d98ed9c1b7d4edc622b963 100644
--- a/src/assistant/tools/qhelpconverter/qhpwriter.h
+++ b/src/assistant/qhelpconverter/qhpwriter.h
@@ -42,7 +42,7 @@
 #ifndef QHPWRITER_H
 #define QHPWRITER_H
 
-#include <QtXml/QXmlStreamWriter>
+#include <QtCore/QXmlStreamWriter>
 #include "filterpage.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/assistant/tools/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
similarity index 100%
rename from src/assistant/tools/qhelpgenerator/main.cpp
rename to src/assistant/qhelpgenerator/main.cpp
diff --git a/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
similarity index 100%
rename from src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
rename to src/assistant/qhelpgenerator/qhelpgenerator.pro
diff --git a/src/assistant/tools/shared/collectionconfiguration.cpp b/src/assistant/shared/collectionconfiguration.cpp
similarity index 100%
rename from src/assistant/tools/shared/collectionconfiguration.cpp
rename to src/assistant/shared/collectionconfiguration.cpp
diff --git a/src/assistant/tools/shared/collectionconfiguration.h b/src/assistant/shared/collectionconfiguration.h
similarity index 100%
rename from src/assistant/tools/shared/collectionconfiguration.h
rename to src/assistant/shared/collectionconfiguration.h
diff --git a/src/assistant/tools/shared/helpgenerator.cpp b/src/assistant/shared/helpgenerator.cpp
similarity index 100%
rename from src/assistant/tools/shared/helpgenerator.cpp
rename to src/assistant/shared/helpgenerator.cpp
diff --git a/src/assistant/tools/shared/helpgenerator.h b/src/assistant/shared/helpgenerator.h
similarity index 100%
rename from src/assistant/tools/shared/helpgenerator.h
rename to src/assistant/shared/helpgenerator.h
diff --git a/src/assistant/tools/tools.pro b/src/assistant/tools/tools.pro
deleted file mode 100644
index 8bb8cd70064d51a814e7c293f9068188c5fd9596..0000000000000000000000000000000000000000
--- a/src/assistant/tools/tools.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-CONFIG  += ordered
-
-SUBDIRS += assistant \
-           qhelpgenerator \
-           qcollectiongenerator \
-           qhelpconverter
-
diff --git a/src/designer/src/lib/extension/default_extensionfactory.cpp b/src/designer/src/lib/extension/default_extensionfactory.cpp
index a908866951a513016218db20dcdb60b7ea1fb9d7..3d143b2cd28cd2351e954b28e8fb5d5672e91339 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.cpp
+++ b/src/designer/src/lib/extension/default_extensionfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDesigner/default_extensionfactory.h>
+#include "default_extensionfactory.h"
 #include "qextensionmanager.h"
 #include <qpointer.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h
index 370e69aaee9fd8e9c839afcbfaab6b41c86c125c..f2ef78ee12a3dfb98139a4fd564a75275400022e 100644
--- a/src/designer/src/lib/extension/default_extensionfactory.h
+++ b/src/designer/src/lib/extension/default_extensionfactory.h
@@ -42,7 +42,7 @@
 #ifndef DEFAULT_EXTENSIONFACTORY_H
 #define DEFAULT_EXTENSIONFACTORY_H
 
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
 #include <QtDesigner/extension.h>
 
 #include <QtCore/QMap>
diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h
index a387924e64f0b48ceb55ef48b7964917ae6d4dc9..e80cddaf9e2c51130383abdea92fd5b3356e8b9a 100644
--- a/src/designer/src/lib/extension/qextensionmanager.h
+++ b/src/designer/src/lib/extension/qextensionmanager.h
@@ -42,7 +42,7 @@
 #ifndef QEXTENSIONMANAGER_H
 #define QEXTENSIONMANAGER_H
 
-#include <QtDesigner/extension_global.h>
+#include "extension_global.h"
 #include <QtDesigner/extension.h>
 #include <QtCore/QHash>
 
diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index 55522d42b02ac0beb0b844e398dbed4c10cbe563..a23e164178c9566c6f10c0b969a89bb79a949287 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -1,33 +1,30 @@
 load(qt_module)
 
-TEMPLATE=lib
-TARGET=QtDesigner
-QT += core-private gui-private widgets widgets-private xml uilib-private
+TARGET = QtDesigner
+QT += core-private gui-private widgets widgets-private xml uilib uilib-private
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-CONFIG += qt
-win32|mac: CONFIG += debug_and_release
-DESTDIR = $$QT_BUILD_TREE/lib
-!wince*:DLLDESTDIR = $$QT.designer.bins
 
-INCLUDEPATH += $$QT.designer.includes \
-               $$QT.designer.private_includes \
-               $$QT.designer.private_includes/QtDesigner
+#win32|mac: CONFIG += debug_and_release
+#DESTDIR = $$QT_BUILD_TREE/lib
+#!wince*:DLLDESTDIR = $$QT.designer.bins
 
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+#INCLUDEPATH += $$QT.designer.includes \
+#               $$QT.designer.private_includes \
+#               $$QT.designer.private_includes/QtDesigner
+
+#isEmpty(QT_MAJOR_VERSION) {
+#   VERSION=4.3.0
+#} else {
+#   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+#}
 
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
 
-include($$QT_SOURCE_TREE/src/qt_targets.pri)
+load(qt_module_config)
 
 HEADERS += qtdesignerversion.h
 
-QMAKE_TARGET_PRODUCT = Designer
-QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
-
 !contains(CONFIG, static) {
     CONFIG += dll
 
@@ -40,13 +37,11 @@ QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
     DEFINES += QT_DESIGNER_STATIC
 }
 
-#load up the headers info
-CONFIG += qt_install_headers
-#headers.pri is loaded from the last include path
-LAST_MODULE_INCLUDE=$$INCLUDEPATH
-for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
-HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
-include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
+##headers.pri is loaded from the last include path
+#LAST_MODULE_INCLUDE=$$INCLUDEPATH
+#for(include_path, INCLUDEPATH):LAST_MODULE_INCLUDE=$${include_path}
+#HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
+#include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
 
 #mac frameworks
 mac:CONFIG += explicitlib
@@ -68,24 +63,22 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 include(extension/extension.pri)
 include(sdk/sdk.pri)
-include($$QT_SOURCE_TREE/tools/uilib/uilib.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib
 include(shared/shared.pri)
 PRECOMPILED_HEADER=lib_pch.h
 
 include(../sharedcomponents.pri)
 include(../components/component.pri)
 
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS        += target
-win32 {
-    dlltarget.path=$$[QT_INSTALL_BINS]
-    INSTALLS += dlltarget
-}
+#target.path=$$[QT_INSTALL_LIBS]
+#INSTALLS        += target
+#win32 {
+#    dlltarget.path=$$[QT_INSTALL_BINS]
+#    INSTALLS += dlltarget
+#}
 
 
-qt_install_headers {
-    designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
-    designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
-    INSTALLS        += designer_headers
-}
+#qt_install_headers {
+#    designer_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
+#    designer_headers.path = $$[QT_INSTALL_HEADERS]/QtDesigner
+#    INSTALLS        += designer_headers
+#}
diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
index 8c63ac99001df494d59bb54d1140af7855fa440c..5b9f1d11bc87b395ad4268b104a2ae7aca74d444 100644
--- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp
@@ -45,7 +45,7 @@
 #include "widgetfactory_p.h"
 #include "qdesigner_introspection_p.h"
 
-#include <ui4_p.h>
+#include <private/ui4_p.h>
 #include <formbuilderextra_p.h>
 // sdk
 #include <QtDesigner/container.h>
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index 771306e9fe23af9c8857afe754cd470686878600..7a846c52b1e2811b55d841756b874ddf5d3734e7 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -46,7 +46,7 @@
 #include "qlayout_widget_p.h"
 #include "qdesigner_introspection_p.h"
 
-#include <formbuilderextra_p.h>
+#include <private/formbuilderextra_p.h>
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 #include <QtDesigner/QDesignerFormEditorInterface>
diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri
index 9cba7d7bf7c4a41bb41b4548f2fec4c8eb8c7a99..d46d170f07ca128c651853713bb5e4d6be7f2fe0 100644
--- a/src/designer/src/lib/shared/shared.pri
+++ b/src/designer/src/lib/shared/shared.pri
@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script
 
 include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
 include(../../../../shared/deviceskin/deviceskin.pri)
-include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
+include($$QT_MODULE_BASE/src/tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
 include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
 
diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp
index 2f241f82dca0a68d0052f60958dbcc71d0264682..22039b39822db19e846858372a860909afc2f631 100644
--- a/src/shared/qtgradienteditor/qtcolorline.cpp
+++ b/src/shared/qtgradienteditor/qtcolorline.cpp
@@ -682,11 +682,12 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
             pmp.end();
 
             p.setBrushOrigin((rect.width() % pixSize + pixSize) / 2, (rect.height() % pixSize + pixSize) / 2);
-            p.setClipRect(r[1].adjusted(4, 4, -4, -4));
-            p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom())), Qt::UniteClip);
-            p.setClipRect(QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight()), Qt::UniteClip);
-            p.setClipRect(QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0)), Qt::UniteClip);
-            p.setClipRect(QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight()), Qt::UniteClip);
+            QRegion region = r[1].adjusted(4, 4, -4, -4);
+            region |= QRect(rect.topLeft(), QPoint(r[1].left() + 0, rect.bottom()));
+            region |= QRect(QPoint(r[1].right() - 0, rect.top()), rect.bottomRight());
+            region |= QRect(rect.topLeft(), QPoint(rect.right(), r[1].top() + 0));
+            region |= QRect(QPoint(rect.left(), r[1].bottom() - 0), rect.bottomRight());
+            p.setClipRegion(region);
             /*
             p.setClipRect(r[1].adjusted(3, 3, -3, -3));
             p.setClipRect(QRect(rect.topLeft(), QPoint(r[1].left() + 1, rect.bottom())), Qt::UniteClip);
@@ -842,11 +843,13 @@ void QtColorLinePrivate::paintEvent(QPaintEvent *)
             }
             p.setBrush(m_alphalessPixmap);
             if (m_orientation == Qt::Horizontal) {
-                p.setClipRect(r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0));
-                p.setClipRect(r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef)), Qt::UniteClip);
+                QRegion region = r[1].adjusted(0, qRound(r[1].height() * coef), 0, 0);
+                region |= r[1].adjusted(0, 0, 0, -qRound(r[1].height() * coef));
+                p.setClipRegion(region);
             } else {
-                p.setClipRect(r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0));
-                p.setClipRect(r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0), Qt::UniteClip);
+                QRegion region = r[1].adjusted(qRound(r[1].width() * coef), 0, 0, 0);
+                region |= r[1].adjusted(0, 0, -qRound(r[1].width() * coef), 0);
+                p.setClipRegion(region);
             }
             p.setBrush(Qt::NoBrush);
             p.setPen(QPen(QColor(c.rgb())));
diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp
index bf9ea0da626d9ba004c7a640fd19657395259029..c32f2384132a65a49987c5b07cb5ed4098c6d8af 100644
--- a/src/shared/qtgradienteditor/qtgradientwidget.cpp
+++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp
@@ -592,9 +592,10 @@ void QtGradientWidget::paintEvent(QPaintEvent *e)
                         central.y() - d_ptr->m_radiusRadial * size().height(),
                         2 * d_ptr->m_radiusRadial * size().width(),
                         2 * d_ptr->m_radiusRadial * size().height());
-        p.setClipRect(r1);
-        p.setClipRect(r2, Qt::UniteClip);
-        p.setClipRect(r3, Qt::UniteClip);
+        QRegion region = r1.toRect();
+        region |= r2.toRect();
+        region |= r3.toRect();
+        p.setClipRegion(region);
         p.drawEllipse(rect);
         if (d_ptr->m_dragHandle == QtGradientWidgetPrivate::RadiusRadialHandle) {
             p.save();
diff --git a/sync.profile b/sync.profile
index f89300826c09a3de14f9a3fc89d4ed77f5dd0ea4..e748d5ecc2395803b6078488fa0b7ff5eceff700 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,6 +1,6 @@
 %modules = ( # path to module name map
-    "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch",
-    "QtHelp" => "$basedir/src/assistant/lib",
+    "QtCLucene" => "$basedir/src/assistant/clucene",
+    "QtHelp" => "$basedir/src/assistant/help",
     "QtDesigner" => "$basedir/src/designer/src/lib",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
@@ -15,7 +15,6 @@
     "xml" => "#include <QtXml/QtXml>\n",
     "network" => "#include <QtNetwork/QtNetwork>\n",
     "script" => "#include <QtScript/QtScript>\n",
-    "qt3support" => "#include <Qt3Support/Qt3Support>\n",
     "declarative" => "#include <QtDeclarative/QtDeclarative>\n",
     "clucene" => "#include <QtCLucene/QtCLucene>\n",
     "help" => "#include <QtHelp/QtHelp>\n",
@@ -27,47 +26,8 @@
     "QtHelp" => "$basedir/modules/qt_help.pri",
     "QtDesigner" => "$basedir/modules/qt_designer.pri",
 );
-# Modules and programs, and their dependencies.
-# Each of the module version specifiers can take one of the following values:
-#   - A specific Git revision.
-#   - "LATEST_REVISION", to always test against the latest revision.
-#   - "LATEST_RELEASE", to always test against the latest public release.
-#   - "THIS_REPOSITORY", to indicate that the module is in this repository.
 %dependencies = (
-    "QtHelp" => {
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "linguist" => {
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtDesigner" => "THIS_REPOSITORY",
-        "QtUiTools" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "designer" => {
-        "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtDesigner" => "THIS_REPOSITORY",
-        "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "assistant" => {
-        "QtWebKit" => "LATEST_REVISION",
-        "QtHelp" => "THIS_REPOSITORY",
-        "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtSql" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
-    "QtDesigner" => {
-        "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-        "QtScript" => "4d15ca64fc7ca81bdadba9fbeb84d4e98a6c0edc",
-        "QtXml" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a",
-    },
+    	"qtbase" => "refs/heads/master",
+        "qtsvg" => "refs/heads/master",
+        "qtxmlpatterns" => "refs/heads/master",
 );