Clean up solution and namespaces

 * Renamed QtProjectLib to QtVSTools.Core
 * Cleaned-up/renamed solution folders
 * Moved qmakefilereader, qrceditor, vsqml to Tools solution folders

Task-number: QTVSADDINBUG-735
Change-Id: I246a7f555a1171c5ab00f6d8efc0ff01228ea693
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

92 files changed, 107 insertions, 113 deletions

diff --git a/.gitignore b/.gitignore
index d43d6d71..290e80d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,7 +278,7 @@ src/config/12.0/source.extension.vsixmanifest
 src/config/14.0/source.extension.vsixmanifest
 src/config/15.0/source.extension.vsixmanifest
 src/config/16.0/source.extension.vsixmanifest
-src/qtprojectlib/Properties/AssemblyInfo.tt.cs
+src/qtvstools.core/Properties/AssemblyInfo.tt.cs
 src/qttemplates/console/Properties/AssemblyInfo.tt.cs
 src/qttemplates/designer/Properties/AssemblyInfo.tt.cs
 src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.tt.cs
diff --git a/src/QtVsTools.sln b/src/QtVsTools.sln
index 5117750c..09b63428 100644
--- a/src/QtVsTools.sln
+++ b/src/QtVsTools.sln
@@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30611.23
 MinimumVisualStudioVersion = 12.0.40629.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Visualizer", "Visualizer", "{56BEEACF-C297-483D-9E64-C0A7C3B7680E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VS Templates", "VS Templates", "{D73514C8-019E-44FB-8D42-F1FD52C1FD72}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{D73514C8-019E-44FB-8D42-F1FD52C1FD72}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QtProjectLib", "qtprojectlib\QtProjectLib.csproj", "{FAA69518-2FEB-4954-9D2C-E7BD6121EA9C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QtVsTools.Core", "qtvstools.core\QtVsTools.Core.csproj", "{FAA69518-2FEB-4954-9D2C-E7BD6121EA9C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QtVsTools", "qtvstools\QtVsTools.csproj", "{FD7A42DB-8692-4FBE-AC50-F70AF423275B}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -71,17 +69,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DialogButtonRight", "qttemp
 		{244991B0-42AD-4324-B166-A26FB6E8CA5B} = {244991B0-42AD-4324-B166-A26FB6E8CA5B}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language", "Language", "{AE9DC593-DC68-45D2-9A96-E80A7CF3BA7F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "qt", "qt", "{62102FDD-016A-4FEC-B73C-808C7B1C7AA5}"
-	ProjectSection(SolutionItems) = preProject
-		qttmlanguage\qt\LICENSE = qttmlanguage\qt\LICENSE
-		qttmlanguage\qt\pri.pro.tmLanguage = qttmlanguage\qt\pri.pro.tmLanguage
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VsQml", "vsqml\vsqml.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "T4 Templates", "T4 Templates", "{24A01B54-CE41-4559-8418-0723F8DF723F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "T4 Text Templates", "T4 Text Templates", "{24A01B54-CE41-4559-8418-0723F8DF723F}"
 	ProjectSection(SolutionItems) = preProject
 		common.tt = common.tt
 		version.tt = version.tt
@@ -123,6 +113,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmakefilereader", "qmakefil
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QtMSBuild", "qtmsbuild\QtMSBuild.csproj", "{C461C580-37A5-4B37-8A7B-10C8E1D3C5B5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{46B0F2DF-BE7A-45DD-AC92-183CC8678054}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -435,7 +427,7 @@ Global
 		{20055427-1352-44FB-8442-BF7F15F9C59E} = {35B29B0F-0B9C-45EB-A8EF-2A8D3BF64B6F}
 		{F7407750-5F72-460F-9C53-27CF509A39B1} = {35B29B0F-0B9C-45EB-A8EF-2A8D3BF64B6F}
 		{F2166B59-E41B-4328-B31D-9E2B9AC5A59C} = {35B29B0F-0B9C-45EB-A8EF-2A8D3BF64B6F}
-		{62102FDD-016A-4FEC-B73C-808C7B1C7AA5} = {AE9DC593-DC68-45D2-9A96-E80A7CF3BA7F}
+		{B12702AD-ABFB-343A-A199-8E24837244A3} = {46B0F2DF-BE7A-45DD-AC92-183CC8678054}
 		{D574EFED-5E19-45BE-9B05-310F65065303} = {3956AF5F-164C-4D38-B5B3-298D9250C193}
 		{48A50432-6BDF-4DE2-A3AD-3A237D31E49D} = {06C8A2E6-A894-4DBA-9DFD-B8E5CB8A2B4F}
 		{06C8A2E6-A894-4DBA-9DFD-B8E5CB8A2B4F} = {3956AF5F-164C-4D38-B5B3-298D9250C193}
@@ -445,6 +437,8 @@ Global
 		{4833E4C7-FFFF-4DA5-A7A5-36C6C3840F16} = {E5CE38AA-4083-438E-B1F7-DD2F0BDEBE47}
 		{DC1AE91B-45CE-4C5B-8F77-CDB58566038F} = {35B29B0F-0B9C-45EB-A8EF-2A8D3BF64B6F}
 		{7AF6C34B-65D2-4010-92F6-420E59DDE9BF} = {35B29B0F-0B9C-45EB-A8EF-2A8D3BF64B6F}
+		{4CEE73C9-FCFA-3A72-A0A3-036BDBB3240F} = {46B0F2DF-BE7A-45DD-AC92-183CC8678054}
+		{70711A97-D9B0-3A86-9756-9FF47337908B} = {46B0F2DF-BE7A-45DD-AC92-183CC8678054}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EDED4DBD-13ED-475C-B6CE-30AB88EDA03D}
diff --git a/src/qtprojectlib/BuildConfig.cs b/src/qtvstools.core/BuildConfig.cs
index 1aa46c6a..6b184848 100644
--- a/src/qtprojectlib/BuildConfig.cs
+++ b/src/qtvstools.core/BuildConfig.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public struct BuildConfig
     {
diff --git a/src/qtprojectlib/CommandLineParser.cs b/src/qtvstools.core/CommandLineParser.cs
index 752ef1bd..94b1ef8d 100644
--- a/src/qtprojectlib/CommandLineParser.cs
+++ b/src/qtvstools.core/CommandLineParser.cs
@@ -34,7 +34,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.IO;
 
-namespace QtProjectLib.CommandLine
+namespace QtVsTools.Core.CommandLine
 {
     using IVSMacroExpander = QtMsBuild.IVSMacroExpander;
 
diff --git a/src/qtprojectlib/Common/EnumExt.cs b/src/qtvstools.core/Common/EnumExt.cs
index 4ebcdacb..4ebcdacb 100644
--- a/src/qtprojectlib/Common/EnumExt.cs
+++ b/src/qtvstools.core/Common/EnumExt.cs
diff --git a/src/qtprojectlib/CompilerToolWrapper.cs b/src/qtvstools.core/CompilerToolWrapper.cs
index 170736d5..395626ad 100644
--- a/src/qtprojectlib/CompilerToolWrapper.cs
+++ b/src/qtvstools.core/CompilerToolWrapper.cs
@@ -32,7 +32,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Wrapper for the VCCLCompilerTool class.
diff --git a/src/qtprojectlib/CxxStreamReader.cs b/src/qtvstools.core/CxxStreamReader.cs
index 224896bb..6554df05 100644
--- a/src/qtprojectlib/CxxStreamReader.cs
+++ b/src/qtvstools.core/CxxStreamReader.cs
@@ -29,7 +29,7 @@
 using System;
 using System.IO;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// StreamReader for C++ files.
diff --git a/src/qtprojectlib/ExportProjectDialog.cs b/src/qtvstools.core/ExportProjectDialog.cs
index a3016a95..d9b513de 100644
--- a/src/qtprojectlib/ExportProjectDialog.cs
+++ b/src/qtvstools.core/ExportProjectDialog.cs
@@ -30,7 +30,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Summary description for ExportProjectDialog.
@@ -105,10 +105,10 @@ namespace QtProjectLib
             panel1 = new System.Windows.Forms.Panel();
             panel2 = new System.Windows.Forms.Panel();
 
-            newButton = new ImageButton(HelperFunctions.GetSharedImage("QtProjectLib.Resources.newitem.png"),
-                HelperFunctions.GetSharedImage("QtProjectLib.Resources.newitem_d.png"));
-            delButton = new ImageButton(HelperFunctions.GetSharedImage("QtProjectLib.Resources.delete.png"),
-                HelperFunctions.GetSharedImage("QtProjectLib.Resources.delete_d.png"));
+            newButton = new ImageButton(HelperFunctions.GetSharedImage("QtVsTools.Core.Resources.newitem.png"),
+                HelperFunctions.GetSharedImage("QtVsTools.Core.Resources.newitem_d.png"));
+            delButton = new ImageButton(HelperFunctions.GetSharedImage("QtVsTools.Core.Resources.delete.png"),
+                HelperFunctions.GetSharedImage("QtVsTools.Core.Resources.delete_d.png"));
             panel1.SuspendLayout();
             panel2.SuspendLayout();
             SuspendLayout();
diff --git a/src/qtprojectlib/ExportProjectDialog.resx b/src/qtvstools.core/ExportProjectDialog.resx
index 0207cabe..0207cabe 100644
--- a/src/qtprojectlib/ExportProjectDialog.resx
+++ b/src/qtvstools.core/ExportProjectDialog.resx
diff --git a/src/qtprojectlib/Extensions.cs b/src/qtvstools.core/Extensions.cs
index bdc9a240..5c9ab0d7 100644
--- a/src/qtprojectlib/Extensions.cs
+++ b/src/qtvstools.core/Extensions.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class Extensions
     {
diff --git a/src/qtprojectlib/FakeFilter.cs b/src/qtvstools.core/FakeFilter.cs
index 7c4ea940..da7e1ca1 100644
--- a/src/qtprojectlib/FakeFilter.cs
+++ b/src/qtvstools.core/FakeFilter.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class FakeFilter
     {
diff --git a/src/qtprojectlib/FilesToList.cs b/src/qtvstools.core/FilesToList.cs
index 7fa24409..675e7f84 100644
--- a/src/qtprojectlib/FilesToList.cs
+++ b/src/qtvstools.core/FilesToList.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public enum FilesToList
     {
diff --git a/src/qtprojectlib/Filters.cs b/src/qtvstools.core/Filters.cs
index e1f1fff2..197306b5 100644
--- a/src/qtprojectlib/Filters.cs
+++ b/src/qtvstools.core/Filters.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class Filters
     {
diff --git a/src/qtprojectlib/HelperFunctions.cs b/src/qtvstools.core/HelperFunctions.cs
index aed6b84c..06a3e8d9 100644
--- a/src/qtprojectlib/HelperFunctions.cs
+++ b/src/qtvstools.core/HelperFunctions.cs
@@ -29,7 +29,7 @@
 using EnvDTE;
 using Microsoft.VisualStudio.VCProjectEngine;
 using Microsoft.Win32;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core.QtMsBuild;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -43,7 +43,7 @@ using System.Windows.Forms;
 
 using Process = System.Diagnostics.Process;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class HelperFunctions
     {
diff --git a/src/qtprojectlib/ImageButton.cs b/src/qtvstools.core/ImageButton.cs
index 23293d25..23ab3ac7 100644
--- a/src/qtprojectlib/ImageButton.cs
+++ b/src/qtvstools.core/ImageButton.cs
@@ -29,7 +29,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class ImageButton : Button
     {
diff --git a/src/qtprojectlib/InfoDialog.cs b/src/qtvstools.core/InfoDialog.cs
index 83f39201..78ae2bc2 100644
--- a/src/qtprojectlib/InfoDialog.cs
+++ b/src/qtvstools.core/InfoDialog.cs
@@ -30,7 +30,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     class InfoDialog : Form
     {
diff --git a/src/qtprojectlib/LinkerToolWrapper.cs b/src/qtvstools.core/LinkerToolWrapper.cs
index f5d5159d..e1e0a607 100644
--- a/src/qtprojectlib/LinkerToolWrapper.cs
+++ b/src/qtvstools.core/LinkerToolWrapper.cs
@@ -32,7 +32,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Adds convenience functions to the VCLinkerTool.
diff --git a/src/qtprojectlib/MainWinWrapper.cs b/src/qtvstools.core/MainWinWrapper.cs
index 066b44ad..d0ead95e 100644
--- a/src/qtprojectlib/MainWinWrapper.cs
+++ b/src/qtvstools.core/MainWinWrapper.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class MainWinWrapper : IWin32Window
     {
diff --git a/src/qtprojectlib/Messages.cs b/src/qtvstools.core/Messages.cs
index 9fea1ed5..a7824e39 100644
--- a/src/qtprojectlib/Messages.cs
+++ b/src/qtvstools.core/Messages.cs
@@ -29,7 +29,7 @@
 using EnvDTE;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class Messages
     {
diff --git a/src/qtprojectlib/MocCmdChecker.cs b/src/qtvstools.core/MocCmdChecker.cs
index 99bb2633..56f69493 100644
--- a/src/qtprojectlib/MocCmdChecker.cs
+++ b/src/qtvstools.core/MocCmdChecker.cs
@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     class MocCmdChecker
     {
diff --git a/src/qtprojectlib/MsBuildProject.cs b/src/qtvstools.core/MsBuildProject.cs
index ac98b1c3..e8b62c46 100644
--- a/src/qtprojectlib/MsBuildProject.cs
+++ b/src/qtvstools.core/MsBuildProject.cs
@@ -33,7 +33,7 @@ using System.Text;
 using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core.QtMsBuild;
 using System.Text.RegularExpressions;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Execution;
@@ -42,7 +42,7 @@ using QtVsTools.VisualStudio;
 using QtVsTools.SyntaxAnalysis;
 using EnvDTE;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     using static HelperFunctions;
     using static RegExpr;
diff --git a/src/qtprojectlib/Observable.cs b/src/qtvstools.core/Observable.cs
index fc855f1a..cb57415b 100644
--- a/src/qtprojectlib/Observable.cs
+++ b/src/qtvstools.core/Observable.cs
@@ -29,7 +29,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public abstract class Observable : INotifyPropertyChanged
     {
diff --git a/src/qtprojectlib/ProFileContent.cs b/src/qtvstools.core/ProFileContent.cs
index 7dbc430d..076798c2 100644
--- a/src/qtprojectlib/ProFileContent.cs
+++ b/src/qtvstools.core/ProFileContent.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using Microsoft.VisualStudio.VCProjectEngine;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     internal class ProFileContent
     {
diff --git a/src/qtprojectlib/ProFileOption.cs b/src/qtvstools.core/ProFileOption.cs
index 0bfed998..276a8750 100644
--- a/src/qtprojectlib/ProFileOption.cs
+++ b/src/qtvstools.core/ProFileOption.cs
@@ -28,7 +28,7 @@
 
 using System.Collections.Generic;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     internal class ProFileOption
     {
diff --git a/src/qtprojectlib/ProSolution.cs b/src/qtvstools.core/ProSolution.cs
index 922d99cd..f3df7418 100644
--- a/src/qtprojectlib/ProSolution.cs
+++ b/src/qtvstools.core/ProSolution.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using EnvDTE;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     internal class ProSolution
     {
diff --git a/src/qtprojectlib/ProjectExporter.cs b/src/qtvstools.core/ProjectExporter.cs
index a1cbd7be..de8a791a 100644
--- a/src/qtprojectlib/ProjectExporter.cs
+++ b/src/qtvstools.core/ProjectExporter.cs
@@ -36,7 +36,7 @@ using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Summary description for ProjectExporter.
diff --git a/src/qtprojectlib/ProjectImporter.cs b/src/qtvstools.core/ProjectImporter.cs
index 492f2446..1fd38430 100644
--- a/src/qtprojectlib/ProjectImporter.cs
+++ b/src/qtvstools.core/ProjectImporter.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class ProjectImporter
     {
diff --git a/src/qtprojectlib/ProjectMacros.cs b/src/qtvstools.core/ProjectMacros.cs
index f1e7cc3c..adfbf475 100644
--- a/src/qtprojectlib/ProjectMacros.cs
+++ b/src/qtvstools.core/ProjectMacros.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class ProjectMacros
     {
diff --git a/src/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtvstools.core/Properties/AssemblyInfo.cs
index 7d866854..7d866854 100644
--- a/src/qtprojectlib/Properties/AssemblyInfo.cs
+++ b/src/qtvstools.core/Properties/AssemblyInfo.cs
diff --git a/src/qtprojectlib/QMake.cs b/src/qtvstools.core/QMake.cs
index 33592b35..d08053dc 100644
--- a/src/qtprojectlib/QMake.cs
+++ b/src/qtvstools.core/QMake.cs
@@ -34,7 +34,7 @@ using System.Linq;
 using System.Text;
 using QtVsTools.VisualStudio;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public abstract class QMake
     {
diff --git a/src/qtprojectlib/QMakeConf.cs b/src/qtvstools.core/QMakeConf.cs
index ccce6395..2701772c 100644
--- a/src/qtprojectlib/QMakeConf.cs
+++ b/src/qtvstools.core/QMakeConf.cs
@@ -30,7 +30,7 @@ using System;
 using System.Collections;
 using System.IO;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QMakeConf
     {
diff --git a/src/qtprojectlib/QMakeQuery.cs b/src/qtvstools.core/QMakeQuery.cs
index 664624bb..126a1d84 100644
--- a/src/qtprojectlib/QMakeQuery.cs
+++ b/src/qtvstools.core/QMakeQuery.cs
@@ -35,7 +35,7 @@ using System.Text;
 using System.Threading;
 using QtVsTools.SyntaxAnalysis;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     using static RegExpr;
 
diff --git a/src/qtprojectlib/QrcItem.cs b/src/qtvstools.core/QrcItem.cs
index a1839dd4..6437a8a3 100644
--- a/src/qtprojectlib/QrcItem.cs
+++ b/src/qtvstools.core/QrcItem.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QrcItem
     {
diff --git a/src/qtprojectlib/QrcParser.cs b/src/qtvstools.core/QrcParser.cs
index 75e75eb5..f64d66d4 100644
--- a/src/qtprojectlib/QrcParser.cs
+++ b/src/qtvstools.core/QrcParser.cs
@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using System.Xml;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QrcParser
     {
diff --git a/src/qtprojectlib/QrcPrefix.cs b/src/qtvstools.core/QrcPrefix.cs
index 43c15357..942f9a95 100644
--- a/src/qtprojectlib/QrcPrefix.cs
+++ b/src/qtvstools.core/QrcPrefix.cs
@@ -28,7 +28,7 @@
 
 using System.Collections.Generic;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QrcPrefix
     {
diff --git a/src/qtprojectlib/QtConfig.cs b/src/qtvstools.core/QtConfig.cs
index ecdc6f9f..ad388b80 100644
--- a/src/qtprojectlib/QtConfig.cs
+++ b/src/qtvstools.core/QtConfig.cs
@@ -30,7 +30,7 @@ using System;
 using System.IO;
 using System.Text.RegularExpressions;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
         enum BuildType {
             Unknown,
diff --git a/src/qtprojectlib/QtModule.cs b/src/qtvstools.core/QtModule.cs
index 308a6002..58136ced 100644
--- a/src/qtprojectlib/QtModule.cs
+++ b/src/qtvstools.core/QtModule.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public enum QtModule
     {
diff --git a/src/qtprojectlib/QtModuleInfo.cs b/src/qtvstools.core/QtModuleInfo.cs
index f24a7d11..70cb1d7a 100644
--- a/src/qtprojectlib/QtModuleInfo.cs
+++ b/src/qtvstools.core/QtModuleInfo.cs
@@ -30,7 +30,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QtModuleInfo
     {
diff --git a/src/qtprojectlib/QtModules.cs b/src/qtvstools.core/QtModules.cs
index 298be8f2..48d190c2 100644
--- a/src/qtprojectlib/QtModules.cs
+++ b/src/qtvstools.core/QtModules.cs
@@ -34,7 +34,7 @@ using System.Text;
 using System.Xml;
 using System.Xml.Linq;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class QtModules
     {
diff --git a/src/qtprojectlib/QtMsBuild.cs b/src/qtvstools.core/QtMsBuild.cs
index 009176d6..7ede2902 100644
--- a/src/qtprojectlib/QtMsBuild.cs
+++ b/src/qtvstools.core/QtMsBuild.cs
@@ -32,10 +32,10 @@ using System.Text;
 using System;
 using System.IO;
 
-using CommandLineParser = QtProjectLib.CommandLine.Parser;
-using CommandLineOption = QtProjectLib.CommandLine.Option;
+using CommandLineParser = QtVsTools.Core.CommandLine.Parser;
+using CommandLineOption = QtVsTools.Core.CommandLine.Option;
 
-namespace QtProjectLib.QtMsBuild
+namespace QtVsTools.Core.QtMsBuild
 {
     public interface IVSMacroExpander
     {
diff --git a/src/qtprojectlib/QtProject.cs b/src/qtvstools.core/QtProject.cs
index f21f67ef..97c601f7 100644
--- a/src/qtprojectlib/QtProject.cs
+++ b/src/qtvstools.core/QtProject.cs
@@ -38,9 +38,9 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Xml;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core.QtMsBuild;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// QtProject holds the Qt specific properties for a Visual Studio project.
diff --git a/src/qtprojectlib/QtVSException.cs b/src/qtvstools.core/QtVSException.cs
index 34d8bad7..dba53df5 100644
--- a/src/qtprojectlib/QtVSException.cs
+++ b/src/qtvstools.core/QtVSException.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     [Serializable]
     public class QtVSException : ApplicationException
diff --git a/src/qtprojectlib/QtVSIPSettings.cs b/src/qtvstools.core/QtVSIPSettings.cs
index 8358d835..0f163d57 100644
--- a/src/qtprojectlib/QtVSIPSettings.cs
+++ b/src/qtvstools.core/QtVSIPSettings.cs
@@ -28,11 +28,11 @@
 
 using Microsoft.VisualStudio.VCProjectEngine;
 using Microsoft.Win32;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core.QtMsBuild;
 using System;
 using System.Collections;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class QtVSIPSettings
     {
diff --git a/src/qtprojectlib/QtVersionManager.cs b/src/qtvstools.core/QtVersionManager.cs
index d3481d8e..567711d3 100644
--- a/src/qtprojectlib/QtVersionManager.cs
+++ b/src/qtvstools.core/QtVersionManager.cs
@@ -37,7 +37,7 @@ using System.Threading;
 using QtVsTools.VisualStudio;
 using EnvDTE;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Summary description for QtVersionManager.
diff --git a/src/qtprojectlib/QtProjectLib.csproj b/src/qtvstools.core/QtVsTools.Core.csproj
index 34b420e2..70d33ce2 100644
--- a/src/qtprojectlib/QtProjectLib.csproj
+++ b/src/qtvstools.core/QtVsTools.Core.csproj
@@ -9,8 +9,8 @@
     <ProjectGuid>{FAA69518-2FEB-4954-9D2C-E7BD6121EA9C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>QtProjectLib</RootNamespace>
-    <AssemblyName>QtProjectLib</AssemblyName>
+    <RootNamespace>QtVsTools.Core</RootNamespace>
+    <AssemblyName>QtVsTools.Core</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -36,7 +36,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>QtProjectLib.ico</ApplicationIcon>
+    <ApplicationIcon>QtVsTools.Core.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="BuildConfig.cs" />
@@ -112,7 +112,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="QtProjectLib.ico" />
+    <Content Include="QtVsTools.Core.ico" />
     <EmbeddedResource Include="Resources.resx">
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\delete.png" />
diff --git a/src/qtprojectlib/QtProjectLib.ico b/src/qtvstools.core/QtVsTools.Core.ico
index 1c4fb80d..1c4fb80d 100644
--- a/src/qtprojectlib/QtProjectLib.ico
+++ b/src/qtvstools.core/QtVsTools.Core.ico
diff --git a/src/qtprojectlib/RccOptions.cs b/src/qtvstools.core/RccOptions.cs
index 43747911..fd6073ce 100644
--- a/src/qtprojectlib/RccOptions.cs
+++ b/src/qtvstools.core/RccOptions.cs
@@ -29,7 +29,7 @@
 using Microsoft.VisualStudio.VCProjectEngine;
 using System;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Summary description for RccOptions.
diff --git a/src/qtprojectlib/Resources.cs b/src/qtvstools.core/Resources.cs
index 2455ce9d..be807610 100644
--- a/src/qtprojectlib/Resources.cs
+++ b/src/qtvstools.core/Resources.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     /// <summary>
     /// Summary description for Resources.
diff --git a/src/qtprojectlib/Resources.resx b/src/qtvstools.core/Resources.resx
index dfc64ec9..dfc64ec9 100644
--- a/src/qtprojectlib/Resources.resx
+++ b/src/qtvstools.core/Resources.resx
diff --git a/src/qtprojectlib/Resources/delete.png b/src/qtvstools.core/Resources/delete.png
index e4139afc..e4139afc 100644
--- a/src/qtprojectlib/Resources/delete.png
+++ b/src/qtvstools.core/Resources/delete.png
diff --git a/src/qtprojectlib/Resources/delete_d.png b/src/qtvstools.core/Resources/delete_d.png
index 9da7f821..9da7f821 100644
--- a/src/qtprojectlib/Resources/delete_d.png
+++ b/src/qtvstools.core/Resources/delete_d.png
diff --git a/src/qtprojectlib/Resources/newitem.png b/src/qtvstools.core/Resources/newitem.png
index 7e26ea9b..7e26ea9b 100644
--- a/src/qtprojectlib/Resources/newitem.png
+++ b/src/qtvstools.core/Resources/newitem.png
diff --git a/src/qtprojectlib/Resources/newitem_d.png b/src/qtvstools.core/Resources/newitem_d.png
index 1b33141d..1b33141d 100644
--- a/src/qtprojectlib/Resources/newitem_d.png
+++ b/src/qtvstools.core/Resources/newitem_d.png
diff --git a/src/qtprojectlib/SR.cs b/src/qtvstools.core/SR.cs
index 2b4d456c..d99ba1e3 100644
--- a/src/qtprojectlib/SR.cs
+++ b/src/qtvstools.core/SR.cs
@@ -31,7 +31,7 @@ using System.Globalization;
 using System.Resources;
 using System.Threading;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     internal sealed class SR
     {
@@ -41,7 +41,7 @@ namespace QtProjectLib
 
         internal SR()
         {
-            resources = new ResourceManager("QtProjectLib.Resources", GetType().Assembly);
+            resources = new ResourceManager("QtVsTools.Core.Resources", GetType().Assembly);
         }
 
         private static SR GetLoader()
diff --git a/src/qtprojectlib/Statics.cs b/src/qtvstools.core/Statics.cs
index e56ed30c..b10bdcf3 100644
--- a/src/qtprojectlib/Statics.cs
+++ b/src/qtvstools.core/Statics.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public static class Statics
     {
diff --git a/src/qtprojectlib/TemplateType.cs b/src/qtvstools.core/TemplateType.cs
index ec1e0ec1..63fb048d 100644
--- a/src/qtprojectlib/TemplateType.cs
+++ b/src/qtvstools.core/TemplateType.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public struct TemplateType
     {
diff --git a/src/qtprojectlib/VersionInformation.cs b/src/qtvstools.core/VersionInformation.cs
index 874ad1db..6ff582da 100644
--- a/src/qtprojectlib/VersionInformation.cs
+++ b/src/qtvstools.core/VersionInformation.cs
@@ -36,7 +36,7 @@ using System.Runtime.Versioning;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class VersionInformation
     {
diff --git a/src/qtprojectlib/VisualStudio/IProjectTracker.cs b/src/qtvstools.core/VisualStudio/IProjectTracker.cs
index 94d55572..94d55572 100644
--- a/src/qtprojectlib/VisualStudio/IProjectTracker.cs
+++ b/src/qtvstools.core/VisualStudio/IProjectTracker.cs
diff --git a/src/qtprojectlib/VisualStudio/VsServiceProvider.cs b/src/qtvstools.core/VisualStudio/VsServiceProvider.cs
index d8a24c01..d8a24c01 100644
--- a/src/qtprojectlib/VisualStudio/VsServiceProvider.cs
+++ b/src/qtvstools.core/VisualStudio/VsServiceProvider.cs
diff --git a/src/qtprojectlib/WaitDialog.cs b/src/qtvstools.core/WaitDialog.cs
index 4488d2f4..cd58b191 100644
--- a/src/qtprojectlib/WaitDialog.cs
+++ b/src/qtvstools.core/WaitDialog.cs
@@ -37,7 +37,7 @@ using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
 using QtVsTools.VisualStudio;
 
-namespace QtProjectLib
+namespace QtVsTools.Core
 {
     public class WaitDialog
     {
diff --git a/src/qtprojectlib/app.config b/src/qtvstools.core/app.config
index 0ee9abe4..0ee9abe4 100644
--- a/src/qtprojectlib/app.config
+++ b/src/qtvstools.core/app.config
diff --git a/src/qtprojectlib/packages.config b/src/qtvstools.core/packages.config
index 3fbe4d23..3fbe4d23 100644
--- a/src/qtprojectlib/packages.config
+++ b/src/qtvstools.core/packages.config
diff --git a/src/qtvstools/AddQtVersionDialog.cs b/src/qtvstools/AddQtVersionDialog.cs
index f1d52a68..46a16de1 100644
--- a/src/qtvstools/AddQtVersionDialog.cs
+++ b/src/qtvstools/AddQtVersionDialog.cs
@@ -29,7 +29,7 @@
 using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell.Settings;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.SyntaxAnalysis;
 using QtVsTools.VisualStudio;
 using System;
diff --git a/src/qtvstools/DteEventsHandler.cs b/src/qtvstools/DteEventsHandler.cs
index 9f9c5324..18ac9a97 100644
--- a/src/qtvstools/DteEventsHandler.cs
+++ b/src/qtvstools/DteEventsHandler.cs
@@ -31,8 +31,8 @@ using EnvDTE80;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core;
+using QtVsTools.Core.QtMsBuild;
 #if VS2017 || VS2019
 using QtVsTools.QtMsBuild;
 #endif
diff --git a/src/qtvstools/Editors/Editor.cs b/src/qtvstools/Editors/Editor.cs
index 32620690..56ebc255 100644
--- a/src/qtvstools/Editors/Editor.cs
+++ b/src/qtvstools/Editors/Editor.cs
@@ -40,7 +40,7 @@ using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
 using System.IO;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 
 namespace QtVsTools.Editors
diff --git a/src/qtvstools/ExtLoader.cs b/src/qtvstools/ExtLoader.cs
index 60b8695d..6e4eec69 100644
--- a/src/qtvstools/ExtLoader.cs
+++ b/src/qtvstools/ExtLoader.cs
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
+using QtVsTools.Core;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
diff --git a/src/qtvstools/FormChangeQtVersion.cs b/src/qtvstools/FormChangeQtVersion.cs
index 2da9457c..5c7c51fe 100644
--- a/src/qtvstools/FormChangeQtVersion.cs
+++ b/src/qtvstools/FormChangeQtVersion.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-using QtProjectLib;
+using QtVsTools.Core;
 using System;
 using System.Windows.Forms;
 
diff --git a/src/qtvstools/FormProjectQtSettings.cs b/src/qtvstools/FormProjectQtSettings.cs
index d164b471..86c976a9 100644
--- a/src/qtvstools/FormProjectQtSettings.cs
+++ b/src/qtvstools/FormProjectQtSettings.cs
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 using EnvDTE;
-using QtProjectLib;
+using QtVsTools.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/qtvstools/FormVSQtSettings.cs b/src/qtvstools/FormVSQtSettings.cs
index d39d5ff3..a5f782dc 100644
--- a/src/qtvstools/FormVSQtSettings.cs
+++ b/src/qtvstools/FormVSQtSettings.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-using QtProjectLib;
+using QtVsTools.Core;
 using System;
 using System.Windows.Forms;
 using System.ComponentModel;
diff --git a/src/qtvstools/ProjectQtSettings.cs b/src/qtvstools/ProjectQtSettings.cs
index 74cbdf25..5e0cea10 100644
--- a/src/qtvstools/ProjectQtSettings.cs
+++ b/src/qtvstools/ProjectQtSettings.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-using QtProjectLib;
+using QtVsTools.Core;
 using System;
 using System.ComponentModel;
 using System.Globalization;
diff --git a/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs b/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
index 3de576ab..42cde652 100644
--- a/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
+++ b/src/qtvstools/QML/Debugging/QmlDebugLauncher.cs
@@ -35,8 +35,8 @@ using Microsoft.VisualStudio.Debugger.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core;
+using QtVsTools.Core.QtMsBuild;
 using QtVsTools.SyntaxAnalysis;
 using static QtVsTools.SyntaxAnalysis.RegExpr;
 
diff --git a/src/qtvstools/QtHelpMenu.cs b/src/qtvstools/QtHelpMenu.cs
index d66eb793..19ad458d 100644
--- a/src/qtvstools/QtHelpMenu.cs
+++ b/src/qtvstools/QtHelpMenu.cs
@@ -31,7 +31,7 @@ using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell.Settings;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System;
 using System.Collections.Generic;
diff --git a/src/qtvstools/QtItemContextMenu.cs b/src/qtvstools/QtItemContextMenu.cs
index a84a5837..57537f93 100644
--- a/src/qtvstools/QtItemContextMenu.cs
+++ b/src/qtvstools/QtItemContextMenu.cs
@@ -28,7 +28,7 @@
 
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System;
 using System.ComponentModel.Design;
diff --git a/src/qtvstools/QtMainMenu.cs b/src/qtvstools/QtMainMenu.cs
index 768d2834..fbe24fd4 100644
--- a/src/qtvstools/QtMainMenu.cs
+++ b/src/qtvstools/QtMainMenu.cs
@@ -28,7 +28,7 @@
 
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System;
 using System.ComponentModel.Design;
diff --git a/src/qtvstools/QtMsBuild/Components/QtModulesEditor.cs b/src/qtvstools/QtMsBuild/Components/QtModulesEditor.cs
index 1bc5bbd8..aa45a83c 100644
--- a/src/qtvstools/QtMsBuild/Components/QtModulesEditor.cs
+++ b/src/qtvstools/QtMsBuild/Components/QtModulesEditor.cs
@@ -40,7 +40,7 @@ using System.Threading.Tasks;
 
 namespace QtVsTools.QtMsBuild
 {
-    using QtProjectLib;
+    using QtVsTools.Core;
 
     [Export(typeof(IPropertyPageUIValueEditor))]
     [ExportMetadata("Name", "QtModulesEditor")]
diff --git a/src/qtvstools/QtMsBuild/Components/QtProjectTracker.cs b/src/qtvstools/QtMsBuild/Components/QtProjectTracker.cs
index f177d410..f3c606d4 100644
--- a/src/qtvstools/QtMsBuild/Components/QtProjectTracker.cs
+++ b/src/qtvstools/QtMsBuild/Components/QtProjectTracker.cs
@@ -39,7 +39,7 @@ using Microsoft.Build.Execution;
 using Microsoft.VisualStudio.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 using EnvDTE;
-using QtProjectLib;
+using QtVsTools.Core;
 using System.Diagnostics;
 
 namespace QtVsTools.QtMsBuild
diff --git a/src/qtvstools/QtMsBuildConverter.cs b/src/qtvstools/QtMsBuildConverter.cs
index ff55a5f5..d90709b9 100644
--- a/src/qtvstools/QtMsBuildConverter.cs
+++ b/src/qtvstools/QtMsBuildConverter.cs
@@ -34,7 +34,7 @@ using System.Windows.Forms;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 
 namespace QtVsTools
diff --git a/src/qtvstools/QtProjectContextMenu.cs b/src/qtvstools/QtProjectContextMenu.cs
index 0f1bfc41..39715104 100644
--- a/src/qtvstools/QtProjectContextMenu.cs
+++ b/src/qtvstools/QtProjectContextMenu.cs
@@ -31,7 +31,7 @@ using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System;
 using System.ComponentModel.Design;
diff --git a/src/qtvstools/QtSolutionContextMenu.cs b/src/qtvstools/QtSolutionContextMenu.cs
index b0935e43..b75d362a 100644
--- a/src/qtvstools/QtSolutionContextMenu.cs
+++ b/src/qtvstools/QtSolutionContextMenu.cs
@@ -28,7 +28,7 @@
 
 using EnvDTE80;
 using Microsoft.VisualStudio.Shell;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System;
 using System.ComponentModel.Design;
diff --git a/src/qtvstools/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj
index 31198be1..0e27b354 100644
--- a/src/qtvstools/QtVsTools.csproj
+++ b/src/qtvstools/QtVsTools.csproj
@@ -375,9 +375,9 @@
       <Project>{4cee73c9-fcfa-3a72-a0a3-036bdbb3240f}</Project>
       <Name>qrceditor</Name>
     </ProjectReference>
-    <ProjectReference Include="..\qtprojectlib\QtProjectLib.csproj">
+    <ProjectReference Include="..\qtvstools.core\QtVsTools.Core.csproj">
       <Project>{faa69518-2feb-4954-9d2c-e7bd6121ea9c}</Project>
-      <Name>QtProjectLib</Name>
+      <Name>QtVsTools.Core</Name>
       <Private>False</Private>
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
@@ -496,7 +496,7 @@
     </ProjectReference>
     <ProjectReference Include="..\vsqml\vsqml.vcxproj">
       <Project>{b12702ad-abfb-343a-a199-8e24837244a3}</Project>
-      <Name>vsqml</Name>
+      <Name>VsQml</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/qtvstools/Translation.cs b/src/qtvstools/Translation.cs
index 0f60773a..ed6ec633 100644
--- a/src/qtvstools/Translation.cs
+++ b/src/qtvstools/Translation.cs
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 using Microsoft.VisualStudio.VCProjectEngine;
-using QtProjectLib;
+using QtVsTools.Core;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
diff --git a/src/qtvstools/VSQtSettings.cs b/src/qtvstools/VSQtSettings.cs
index 4a8a9095..52b95a77 100644
--- a/src/qtvstools/VSQtSettings.cs
+++ b/src/qtvstools/VSQtSettings.cs
@@ -29,7 +29,7 @@
 using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell.Settings;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs
index 7561e4b2..a95fbe94 100644
--- a/src/qtvstools/Vsix.cs
+++ b/src/qtvstools/Vsix.cs
@@ -34,7 +34,7 @@ using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell.Settings;
 using Microsoft.VisualStudio.Threading;
 using Microsoft.Win32;
-using QtProjectLib;
+using QtVsTools.Core;
 using System;
 using System.Diagnostics;
 using System.IO;
diff --git a/src/qtwizard/QtVsTools.Wizards.csproj b/src/qtwizard/QtVsTools.Wizards.csproj
index 5a322dcd..5b7a942c 100644
--- a/src/qtwizard/QtVsTools.Wizards.csproj
+++ b/src/qtwizard/QtVsTools.Wizards.csproj
@@ -173,9 +173,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\qtprojectlib\QtProjectLib.csproj">
+    <ProjectReference Include="..\qtvstools.core\QtVsTools.Core.csproj">
       <Project>{faa69518-2feb-4954-9d2c-e7bd6121ea9c}</Project>
-      <Name>QtProjectLib</Name>
+      <Name>QtVsTools.Core</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -201,4 +201,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/qtwizard/Wizards/ClassWizard/Core/CoreClassWizard.cs b/src/qtwizard/Wizards/ClassWizard/Core/CoreClassWizard.cs
index 1d792d34..f4dfe389 100644
--- a/src/qtwizard/Wizards/ClassWizard/Core/CoreClassWizard.cs
+++ b/src/qtwizard/Wizards/ClassWizard/Core/CoreClassWizard.cs
@@ -31,7 +31,7 @@ using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TemplateWizard;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/qtwizard/Wizards/ClassWizard/Gui/GuiClassWizard.cs b/src/qtwizard/Wizards/ClassWizard/Gui/GuiClassWizard.cs
index 5ee883b5..14ea7a5e 100644
--- a/src/qtwizard/Wizards/ClassWizard/Gui/GuiClassWizard.cs
+++ b/src/qtwizard/Wizards/ClassWizard/Gui/GuiClassWizard.cs
@@ -31,7 +31,7 @@ using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TemplateWizard;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/qtwizard/Wizards/ProjectWizard/ConfigPage.xaml.cs b/src/qtwizard/Wizards/ProjectWizard/ConfigPage.xaml.cs
index ebbdc9e3..a7cd1bf6 100644
--- a/src/qtwizard/Wizards/ProjectWizard/ConfigPage.xaml.cs
+++ b/src/qtwizard/Wizards/ProjectWizard/ConfigPage.xaml.cs
@@ -41,7 +41,7 @@ using QtVsTools.Common;
 
 namespace QtVsTools.Wizards.ProjectWizard
 {
-    using QtProjectLib;
+    using QtVsTools.Core;
 
     public partial class ConfigPage : WizardPage
     {
diff --git a/src/qtwizard/Wizards/ProjectWizard/Gui/GuiWizard.cs b/src/qtwizard/Wizards/ProjectWizard/Gui/GuiWizard.cs
index 74fc99e8..30ac15c3 100644
--- a/src/qtwizard/Wizards/ProjectWizard/Gui/GuiWizard.cs
+++ b/src/qtwizard/Wizards/ProjectWizard/Gui/GuiWizard.cs
@@ -34,7 +34,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using EnvDTE;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.Common;
 
 namespace QtVsTools.Wizards.ProjectWizard
diff --git a/src/qtwizard/Wizards/ProjectWizard/ModulePage.xaml.cs b/src/qtwizard/Wizards/ProjectWizard/ModulePage.xaml.cs
index 4938b501..f81d6b65 100644
--- a/src/qtwizard/Wizards/ProjectWizard/ModulePage.xaml.cs
+++ b/src/qtwizard/Wizards/ProjectWizard/ModulePage.xaml.cs
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-using QtProjectLib;
+using QtVsTools.Core;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
diff --git a/src/qtwizard/Wizards/ProjectWizard/ProjectTemplateWizard.cs b/src/qtwizard/Wizards/ProjectWizard/ProjectTemplateWizard.cs
index ad3a9469..ca9f7d9a 100644
--- a/src/qtwizard/Wizards/ProjectWizard/ProjectTemplateWizard.cs
+++ b/src/qtwizard/Wizards/ProjectWizard/ProjectTemplateWizard.cs
@@ -42,8 +42,8 @@ using Microsoft.VisualStudio.TemplateWizard;
 using QtVsTools.Common;
 using QtVsTools.VisualStudio;
 
-using QtProjectLib;
-using QtProjectLib.QtMsBuild;
+using QtVsTools.Core;
+using QtVsTools.Core.QtMsBuild;
 
 namespace QtVsTools.Wizards.ProjectWizard
 {
diff --git a/src/qtwizard/Wizards/ProjectWizard/Server/ServerWizard.cs b/src/qtwizard/Wizards/ProjectWizard/Server/ServerWizard.cs
index 5a69100e..e836021d 100644
--- a/src/qtwizard/Wizards/ProjectWizard/Server/ServerWizard.cs
+++ b/src/qtwizard/Wizards/ProjectWizard/Server/ServerWizard.cs
@@ -32,7 +32,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using EnvDTE;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.Common;
 
 namespace QtVsTools.Wizards.ProjectWizard
diff --git a/src/qtwizard/Wizards/Util/FileExistsInFilterValidationRule.cs b/src/qtwizard/Wizards/Util/FileExistsInFilterValidationRule.cs
index da78a10c..21c7c515 100644
--- a/src/qtwizard/Wizards/Util/FileExistsInFilterValidationRule.cs
+++ b/src/qtwizard/Wizards/Util/FileExistsInFilterValidationRule.cs
@@ -29,7 +29,7 @@
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using QtProjectLib;
+using QtVsTools.Core;
 using QtVsTools.VisualStudio;
 using System.Globalization;
 using System.Linq;