diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro
index b17d923a3b5..32ca5f08422 100644
--- a/src/tools/clangbackend/clangbackend.pro
+++ b/src/tools/clangbackend/clangbackend.pro
@@ -4,7 +4,7 @@ QTC_LIB_DEPENDS += \
 
 include(../../qtcreatortool.pri)
 include(../../shared/clang/clang_installation.pri)
-include(ipcsource/clangbackendclangipc-source.pri)
+include(source/clangbackendclangipc-source.pri)
 
 QT += core network
 QT -= gui
diff --git a/src/tools/clangbackend/clangbackend.qbs b/src/tools/clangbackend/clangbackend.qbs
index 4a1ca115792..495c586f855 100644
--- a/src/tools/clangbackend/clangbackend.qbs
+++ b/src/tools/clangbackend/clangbackend.qbs
@@ -7,7 +7,7 @@ QtcTool {
     Depends { name: "libclang"; required: false }
 
     Group {
-        prefix: "ipcsource/"
+        prefix: "source/"
         files: [
             "*.h",
             "*.cpp"
@@ -26,7 +26,7 @@ QtcTool {
 
     condition: libclang.present
 
-    cpp.includePaths: base.concat(["ipcsource", libclang.llvmIncludeDir])
+    cpp.includePaths: base.concat(["source", libclang.llvmIncludeDir])
     cpp.libraryPaths: base.concat(libclang.llvmLibDir)
     cpp.dynamicLibraries: base.concat(libclang.llvmLibs)
     cpp.rpaths: base.concat(libclang.llvmLibDir)
diff --git a/src/tools/clangbackend/ipcsource/clangasyncjob.h b/src/tools/clangbackend/source/clangasyncjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangasyncjob.h
rename to src/tools/clangbackend/source/clangasyncjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangbackend_global.h b/src/tools/clangbackend/source/clangbackend_global.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangbackend_global.h
rename to src/tools/clangbackend/source/clangbackend_global.h
diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/source/clangbackendclangipc-source.pri
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
rename to src/tools/clangbackend/source/clangbackendclangipc-source.pri
diff --git a/src/tools/clangbackend/ipcsource/clangclock.h b/src/tools/clangbackend/source/clangclock.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangclock.h
rename to src/tools/clangbackend/source/clangclock.h
diff --git a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.cpp b/src/tools/clangbackend/source/clangcodecompleteresults.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcodecompleteresults.cpp
rename to src/tools/clangbackend/source/clangcodecompleteresults.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h b/src/tools/clangbackend/source/clangcodecompleteresults.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
rename to src/tools/clangbackend/source/clangcodecompleteresults.h
diff --git a/src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp b/src/tools/clangbackend/source/clangcodemodelserver.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcodemodelserver.cpp
rename to src/tools/clangbackend/source/clangcodemodelserver.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangcodemodelserver.h b/src/tools/clangbackend/source/clangcodemodelserver.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcodemodelserver.h
rename to src/tools/clangbackend/source/clangcodemodelserver.h
diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp b/src/tools/clangbackend/source/clangcompletecodejob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcompletecodejob.cpp
rename to src/tools/clangbackend/source/clangcompletecodejob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangcompletecodejob.h b/src/tools/clangbackend/source/clangcompletecodejob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcompletecodejob.h
rename to src/tools/clangbackend/source/clangcompletecodejob.h
diff --git a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp b/src/tools/clangbackend/source/clangcreateinitialdocumentpreamblejob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.cpp
rename to src/tools/clangbackend/source/clangcreateinitialdocumentpreamblejob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.h b/src/tools/clangbackend/source/clangcreateinitialdocumentpreamblejob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangcreateinitialdocumentpreamblejob.h
rename to src/tools/clangbackend/source/clangcreateinitialdocumentpreamblejob.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocument.cpp b/src/tools/clangbackend/source/clangdocument.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocument.cpp
rename to src/tools/clangbackend/source/clangdocument.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangdocument.h b/src/tools/clangbackend/source/clangdocument.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocument.h
rename to src/tools/clangbackend/source/clangdocument.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentjob.h b/src/tools/clangbackend/source/clangdocumentjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentjob.h
rename to src/tools/clangbackend/source/clangdocumentjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentprocessor.cpp b/src/tools/clangbackend/source/clangdocumentprocessor.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentprocessor.cpp
rename to src/tools/clangbackend/source/clangdocumentprocessor.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentprocessor.h b/src/tools/clangbackend/source/clangdocumentprocessor.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentprocessor.h
rename to src/tools/clangbackend/source/clangdocumentprocessor.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentprocessors.cpp b/src/tools/clangbackend/source/clangdocumentprocessors.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentprocessors.cpp
rename to src/tools/clangbackend/source/clangdocumentprocessors.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentprocessors.h b/src/tools/clangbackend/source/clangdocumentprocessors.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentprocessors.h
rename to src/tools/clangbackend/source/clangdocumentprocessors.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocuments.cpp b/src/tools/clangbackend/source/clangdocuments.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocuments.cpp
rename to src/tools/clangbackend/source/clangdocuments.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangdocuments.h b/src/tools/clangbackend/source/clangdocuments.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocuments.h
rename to src/tools/clangbackend/source/clangdocuments.h
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp b/src/tools/clangbackend/source/clangdocumentsuspenderresumer.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.cpp
rename to src/tools/clangbackend/source/clangdocumentsuspenderresumer.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.h b/src/tools/clangbackend/source/clangdocumentsuspenderresumer.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangdocumentsuspenderresumer.h
rename to src/tools/clangbackend/source/clangdocumentsuspenderresumer.h
diff --git a/src/tools/clangbackend/ipcsource/clangexceptions.cpp b/src/tools/clangbackend/source/clangexceptions.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangexceptions.cpp
rename to src/tools/clangbackend/source/clangexceptions.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangexceptions.h b/src/tools/clangbackend/source/clangexceptions.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangexceptions.h
rename to src/tools/clangbackend/source/clangexceptions.h
diff --git a/src/tools/clangbackend/ipcsource/clangfilepath.cpp b/src/tools/clangbackend/source/clangfilepath.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfilepath.cpp
rename to src/tools/clangbackend/source/clangfilepath.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangfilepath.h b/src/tools/clangbackend/source/clangfilepath.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfilepath.h
rename to src/tools/clangbackend/source/clangfilepath.h
diff --git a/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.cpp b/src/tools/clangbackend/source/clangfilesystemwatcher.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfilesystemwatcher.cpp
rename to src/tools/clangbackend/source/clangfilesystemwatcher.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h b/src/tools/clangbackend/source/clangfilesystemwatcher.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h
rename to src/tools/clangbackend/source/clangfilesystemwatcher.h
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp b/src/tools/clangbackend/source/clangfollowsymbol.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfollowsymbol.cpp
rename to src/tools/clangbackend/source/clangfollowsymbol.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymbol.h b/src/tools/clangbackend/source/clangfollowsymbol.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfollowsymbol.h
rename to src/tools/clangbackend/source/clangfollowsymbol.h
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp b/src/tools/clangbackend/source/clangfollowsymboljob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfollowsymboljob.cpp
rename to src/tools/clangbackend/source/clangfollowsymboljob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangfollowsymboljob.h b/src/tools/clangbackend/source/clangfollowsymboljob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangfollowsymboljob.h
rename to src/tools/clangbackend/source/clangfollowsymboljob.h
diff --git a/src/tools/clangbackend/ipcsource/clangiasyncjob.cpp b/src/tools/clangbackend/source/clangiasyncjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
rename to src/tools/clangbackend/source/clangiasyncjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangiasyncjob.h b/src/tools/clangbackend/source/clangiasyncjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangiasyncjob.h
rename to src/tools/clangbackend/source/clangiasyncjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangjobcontext.cpp b/src/tools/clangbackend/source/clangjobcontext.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobcontext.cpp
rename to src/tools/clangbackend/source/clangjobcontext.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangjobcontext.h b/src/tools/clangbackend/source/clangjobcontext.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobcontext.h
rename to src/tools/clangbackend/source/clangjobcontext.h
diff --git a/src/tools/clangbackend/ipcsource/clangjobqueue.cpp b/src/tools/clangbackend/source/clangjobqueue.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobqueue.cpp
rename to src/tools/clangbackend/source/clangjobqueue.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangjobqueue.h b/src/tools/clangbackend/source/clangjobqueue.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobqueue.h
rename to src/tools/clangbackend/source/clangjobqueue.h
diff --git a/src/tools/clangbackend/ipcsource/clangjobrequest.cpp b/src/tools/clangbackend/source/clangjobrequest.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobrequest.cpp
rename to src/tools/clangbackend/source/clangjobrequest.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangjobrequest.h b/src/tools/clangbackend/source/clangjobrequest.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobrequest.h
rename to src/tools/clangbackend/source/clangjobrequest.h
diff --git a/src/tools/clangbackend/ipcsource/clangjobs.cpp b/src/tools/clangbackend/source/clangjobs.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobs.cpp
rename to src/tools/clangbackend/source/clangjobs.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangjobs.h b/src/tools/clangbackend/source/clangjobs.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangjobs.h
rename to src/tools/clangbackend/source/clangjobs.h
diff --git a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/source/clangparsesupportivetranslationunitjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.cpp
rename to src/tools/clangbackend/source/clangparsesupportivetranslationunitjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.h b/src/tools/clangbackend/source/clangparsesupportivetranslationunitjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangparsesupportivetranslationunitjob.h
rename to src/tools/clangbackend/source/clangparsesupportivetranslationunitjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.cpp b/src/tools/clangbackend/source/clangreferencescollector.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangreferencescollector.cpp
rename to src/tools/clangbackend/source/clangreferencescollector.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangreferencescollector.h b/src/tools/clangbackend/source/clangreferencescollector.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangreferencescollector.h
rename to src/tools/clangbackend/source/clangreferencescollector.h
diff --git a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp b/src/tools/clangbackend/source/clangreparsesupportivetranslationunitjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.cpp
rename to src/tools/clangbackend/source/clangreparsesupportivetranslationunitjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.h b/src/tools/clangbackend/source/clangreparsesupportivetranslationunitjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangreparsesupportivetranslationunitjob.h
rename to src/tools/clangbackend/source/clangreparsesupportivetranslationunitjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp b/src/tools/clangbackend/source/clangrequestdocumentannotationsjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.cpp
rename to src/tools/clangbackend/source/clangrequestdocumentannotationsjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h b/src/tools/clangbackend/source/clangrequestdocumentannotationsjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangrequestdocumentannotationsjob.h
rename to src/tools/clangbackend/source/clangrequestdocumentannotationsjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp b/src/tools/clangbackend/source/clangrequestreferencesjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangrequestreferencesjob.cpp
rename to src/tools/clangbackend/source/clangrequestreferencesjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h b/src/tools/clangbackend/source/clangrequestreferencesjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangrequestreferencesjob.h
rename to src/tools/clangbackend/source/clangrequestreferencesjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangresumedocumentjob.cpp b/src/tools/clangbackend/source/clangresumedocumentjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangresumedocumentjob.cpp
rename to src/tools/clangbackend/source/clangresumedocumentjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangresumedocumentjob.h b/src/tools/clangbackend/source/clangresumedocumentjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangresumedocumentjob.h
rename to src/tools/clangbackend/source/clangresumedocumentjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangstring.h b/src/tools/clangbackend/source/clangstring.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangstring.h
rename to src/tools/clangbackend/source/clangstring.h
diff --git a/src/tools/clangbackend/ipcsource/clangsupportivetranslationunitinitializer.cpp b/src/tools/clangbackend/source/clangsupportivetranslationunitinitializer.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangsupportivetranslationunitinitializer.cpp
rename to src/tools/clangbackend/source/clangsupportivetranslationunitinitializer.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangsupportivetranslationunitinitializer.h b/src/tools/clangbackend/source/clangsupportivetranslationunitinitializer.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangsupportivetranslationunitinitializer.h
rename to src/tools/clangbackend/source/clangsupportivetranslationunitinitializer.h
diff --git a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp b/src/tools/clangbackend/source/clangsuspenddocumentjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.cpp
rename to src/tools/clangbackend/source/clangsuspenddocumentjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.h b/src/tools/clangbackend/source/clangsuspenddocumentjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangsuspenddocumentjob.h
rename to src/tools/clangbackend/source/clangsuspenddocumentjob.h
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp b/src/tools/clangbackend/source/clangtranslationunit.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunit.cpp
rename to src/tools/clangbackend/source/clangtranslationunit.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.h b/src/tools/clangbackend/source/clangtranslationunit.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunit.h
rename to src/tools/clangbackend/source/clangtranslationunit.h
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunits.cpp b/src/tools/clangbackend/source/clangtranslationunits.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunits.cpp
rename to src/tools/clangbackend/source/clangtranslationunits.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunits.h b/src/tools/clangbackend/source/clangtranslationunits.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunits.h
rename to src/tools/clangbackend/source/clangtranslationunits.h
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp b/src/tools/clangbackend/source/clangtranslationunitupdater.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunitupdater.cpp
rename to src/tools/clangbackend/source/clangtranslationunitupdater.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h b/src/tools/clangbackend/source/clangtranslationunitupdater.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtranslationunitupdater.h
rename to src/tools/clangbackend/source/clangtranslationunitupdater.h
diff --git a/src/tools/clangbackend/ipcsource/clangtype.cpp b/src/tools/clangbackend/source/clangtype.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtype.cpp
rename to src/tools/clangbackend/source/clangtype.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangtype.h b/src/tools/clangbackend/source/clangtype.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangtype.h
rename to src/tools/clangbackend/source/clangtype.h
diff --git a/src/tools/clangbackend/ipcsource/clangunsavedfilesshallowarguments.cpp b/src/tools/clangbackend/source/clangunsavedfilesshallowarguments.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangunsavedfilesshallowarguments.cpp
rename to src/tools/clangbackend/source/clangunsavedfilesshallowarguments.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangunsavedfilesshallowarguments.h b/src/tools/clangbackend/source/clangunsavedfilesshallowarguments.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangunsavedfilesshallowarguments.h
rename to src/tools/clangbackend/source/clangunsavedfilesshallowarguments.h
diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp b/src/tools/clangbackend/source/clangupdatedocumentannotationsjob.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.cpp
rename to src/tools/clangbackend/source/clangupdatedocumentannotationsjob.cpp
diff --git a/src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h b/src/tools/clangbackend/source/clangupdatedocumentannotationsjob.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/clangupdatedocumentannotationsjob.h
rename to src/tools/clangbackend/source/clangupdatedocumentannotationsjob.h
diff --git a/src/tools/clangbackend/ipcsource/codecompleter.cpp b/src/tools/clangbackend/source/codecompleter.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompleter.cpp
rename to src/tools/clangbackend/source/codecompleter.cpp
diff --git a/src/tools/clangbackend/ipcsource/codecompleter.h b/src/tools/clangbackend/source/codecompleter.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompleter.h
rename to src/tools/clangbackend/source/codecompleter.h
diff --git a/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp b/src/tools/clangbackend/source/codecompletionchunkconverter.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompletionchunkconverter.cpp
rename to src/tools/clangbackend/source/codecompletionchunkconverter.cpp
diff --git a/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h b/src/tools/clangbackend/source/codecompletionchunkconverter.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h
rename to src/tools/clangbackend/source/codecompletionchunkconverter.h
diff --git a/src/tools/clangbackend/ipcsource/codecompletionsextractor.cpp b/src/tools/clangbackend/source/codecompletionsextractor.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompletionsextractor.cpp
rename to src/tools/clangbackend/source/codecompletionsextractor.cpp
diff --git a/src/tools/clangbackend/ipcsource/codecompletionsextractor.h b/src/tools/clangbackend/source/codecompletionsextractor.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/codecompletionsextractor.h
rename to src/tools/clangbackend/source/codecompletionsextractor.h
diff --git a/src/tools/clangbackend/ipcsource/commandlinearguments.cpp b/src/tools/clangbackend/source/commandlinearguments.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/commandlinearguments.cpp
rename to src/tools/clangbackend/source/commandlinearguments.cpp
diff --git a/src/tools/clangbackend/ipcsource/commandlinearguments.h b/src/tools/clangbackend/source/commandlinearguments.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/commandlinearguments.h
rename to src/tools/clangbackend/source/commandlinearguments.h
diff --git a/src/tools/clangbackend/ipcsource/cursor.cpp b/src/tools/clangbackend/source/cursor.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/cursor.cpp
rename to src/tools/clangbackend/source/cursor.cpp
diff --git a/src/tools/clangbackend/ipcsource/cursor.h b/src/tools/clangbackend/source/cursor.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/cursor.h
rename to src/tools/clangbackend/source/cursor.h
diff --git a/src/tools/clangbackend/ipcsource/diagnostic.cpp b/src/tools/clangbackend/source/diagnostic.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/diagnostic.cpp
rename to src/tools/clangbackend/source/diagnostic.cpp
diff --git a/src/tools/clangbackend/ipcsource/diagnostic.h b/src/tools/clangbackend/source/diagnostic.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/diagnostic.h
rename to src/tools/clangbackend/source/diagnostic.h
diff --git a/src/tools/clangbackend/ipcsource/diagnosticset.cpp b/src/tools/clangbackend/source/diagnosticset.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/diagnosticset.cpp
rename to src/tools/clangbackend/source/diagnosticset.cpp
diff --git a/src/tools/clangbackend/ipcsource/diagnosticset.h b/src/tools/clangbackend/source/diagnosticset.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/diagnosticset.h
rename to src/tools/clangbackend/source/diagnosticset.h
diff --git a/src/tools/clangbackend/ipcsource/diagnosticsetiterator.h b/src/tools/clangbackend/source/diagnosticsetiterator.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/diagnosticsetiterator.h
rename to src/tools/clangbackend/source/diagnosticsetiterator.h
diff --git a/src/tools/clangbackend/ipcsource/fixit.cpp b/src/tools/clangbackend/source/fixit.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/fixit.cpp
rename to src/tools/clangbackend/source/fixit.cpp
diff --git a/src/tools/clangbackend/ipcsource/fixit.h b/src/tools/clangbackend/source/fixit.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/fixit.h
rename to src/tools/clangbackend/source/fixit.h
diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.cpp b/src/tools/clangbackend/source/highlightingmark.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/highlightingmark.cpp
rename to src/tools/clangbackend/source/highlightingmark.cpp
diff --git a/src/tools/clangbackend/ipcsource/highlightingmark.h b/src/tools/clangbackend/source/highlightingmark.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/highlightingmark.h
rename to src/tools/clangbackend/source/highlightingmark.h
diff --git a/src/tools/clangbackend/ipcsource/highlightingmarks.cpp b/src/tools/clangbackend/source/highlightingmarks.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/highlightingmarks.cpp
rename to src/tools/clangbackend/source/highlightingmarks.cpp
diff --git a/src/tools/clangbackend/ipcsource/highlightingmarks.h b/src/tools/clangbackend/source/highlightingmarks.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/highlightingmarks.h
rename to src/tools/clangbackend/source/highlightingmarks.h
diff --git a/src/tools/clangbackend/ipcsource/highlightingmarksiterator.h b/src/tools/clangbackend/source/highlightingmarksiterator.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/highlightingmarksiterator.h
rename to src/tools/clangbackend/source/highlightingmarksiterator.h
diff --git a/src/tools/clangbackend/ipcsource/projectpart.cpp b/src/tools/clangbackend/source/projectpart.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/projectpart.cpp
rename to src/tools/clangbackend/source/projectpart.cpp
diff --git a/src/tools/clangbackend/ipcsource/projectpart.h b/src/tools/clangbackend/source/projectpart.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/projectpart.h
rename to src/tools/clangbackend/source/projectpart.h
diff --git a/src/tools/clangbackend/ipcsource/projects.cpp b/src/tools/clangbackend/source/projects.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/projects.cpp
rename to src/tools/clangbackend/source/projects.cpp
diff --git a/src/tools/clangbackend/ipcsource/projects.h b/src/tools/clangbackend/source/projects.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/projects.h
rename to src/tools/clangbackend/source/projects.h
diff --git a/src/tools/clangbackend/ipcsource/skippedsourceranges.cpp b/src/tools/clangbackend/source/skippedsourceranges.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/skippedsourceranges.cpp
rename to src/tools/clangbackend/source/skippedsourceranges.cpp
diff --git a/src/tools/clangbackend/ipcsource/skippedsourceranges.h b/src/tools/clangbackend/source/skippedsourceranges.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/skippedsourceranges.h
rename to src/tools/clangbackend/source/skippedsourceranges.h
diff --git a/src/tools/clangbackend/ipcsource/sourcelocation.cpp b/src/tools/clangbackend/source/sourcelocation.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/sourcelocation.cpp
rename to src/tools/clangbackend/source/sourcelocation.cpp
diff --git a/src/tools/clangbackend/ipcsource/sourcelocation.h b/src/tools/clangbackend/source/sourcelocation.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/sourcelocation.h
rename to src/tools/clangbackend/source/sourcelocation.h
diff --git a/src/tools/clangbackend/ipcsource/sourcerange.cpp b/src/tools/clangbackend/source/sourcerange.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/sourcerange.cpp
rename to src/tools/clangbackend/source/sourcerange.cpp
diff --git a/src/tools/clangbackend/ipcsource/sourcerange.h b/src/tools/clangbackend/source/sourcerange.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/sourcerange.h
rename to src/tools/clangbackend/source/sourcerange.h
diff --git a/src/tools/clangbackend/ipcsource/unsavedfile.cpp b/src/tools/clangbackend/source/unsavedfile.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/unsavedfile.cpp
rename to src/tools/clangbackend/source/unsavedfile.cpp
diff --git a/src/tools/clangbackend/ipcsource/unsavedfile.h b/src/tools/clangbackend/source/unsavedfile.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/unsavedfile.h
rename to src/tools/clangbackend/source/unsavedfile.h
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp b/src/tools/clangbackend/source/unsavedfiles.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/unsavedfiles.cpp
rename to src/tools/clangbackend/source/unsavedfiles.cpp
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/source/unsavedfiles.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/unsavedfiles.h
rename to src/tools/clangbackend/source/unsavedfiles.h
diff --git a/src/tools/clangbackend/ipcsource/utf8positionfromlinecolumn.cpp b/src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp
similarity index 100%
rename from src/tools/clangbackend/ipcsource/utf8positionfromlinecolumn.cpp
rename to src/tools/clangbackend/source/utf8positionfromlinecolumn.cpp
diff --git a/src/tools/clangbackend/ipcsource/utf8positionfromlinecolumn.h b/src/tools/clangbackend/source/utf8positionfromlinecolumn.h
similarity index 100%
rename from src/tools/clangbackend/ipcsource/utf8positionfromlinecolumn.h
rename to src/tools/clangbackend/source/utf8positionfromlinecolumn.h
diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri
index b9a5db097c8..2a960f323e2 100644
--- a/tests/unit/unittest/creator_dependency.pri
+++ b/tests/unit/unittest/creator_dependency.pri
@@ -16,7 +16,7 @@ include($$PWD/../../../src/plugins/cpptools/cpptoolsunittestfiles.pri)
 include(cplusplus.pri)
 !isEmpty(LLVM_INSTALL_DIR) {
 include($$PWD/../../../src/shared/clang/clang_defines.pri)
-include($$PWD/../../../src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri)
+include($$PWD/../../../src/tools/clangbackend/source/clangbackendclangipc-source.pri)
 include($$PWD/../../../src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri)
 } else {
 DEFINES += CLANG_VERSION=\\\"3.9.1\\\"