Adjust namespace of Utils class to match folder structure

Change-Id: I462c9cc4b96aaf354f77739da64202e2a7dc8af2
Reviewed-by: Ali Can Demiralp <ali.demiralp@qt.io>
Reviewed-by: Miguel Costa <miguel.costa@qt.io>

40 files changed, 54 insertions, 45 deletions

diff --git a/QtVsTools.Core/CMake/CMakeProject.Debug.cs b/QtVsTools.Core/CMake/CMakeProject.Debug.cs
index e46e525a..cedd52cb 100644
--- a/QtVsTools.Core/CMake/CMakeProject.Debug.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.Debug.cs
@@ -14,6 +14,8 @@ using Newtonsoft.Json.Linq;
 
 namespace QtVsTools.Core.CMake
 {
+    using Common;
+
     public partial class CMakeProject : Concurrent<CMakeProject>
     {
         private async Task AddLaunchSettingsAsync(string target)
diff --git a/QtVsTools.Core/CMake/CMakeProject.Format.cs b/QtVsTools.Core/CMake/CMakeProject.Format.cs
index 00df3103..7cbd8ad6 100644
--- a/QtVsTools.Core/CMake/CMakeProject.Format.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.Format.cs
@@ -13,6 +13,8 @@ using Task = System.Threading.Tasks.Task;
 
 namespace QtVsTools.Core.CMake
 {
+    using Common;
+
     public partial class CMakeProject : Concurrent<CMakeProject>
     {
         public enum QtStatus { False, NullPresets, ConversionPending, True }
diff --git a/QtVsTools.Core/CMake/CMakeProject.Messages.cs b/QtVsTools.Core/CMake/CMakeProject.Messages.cs
index bb590897..03fe46ec 100644
--- a/QtVsTools.Core/CMake/CMakeProject.Messages.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.Messages.cs
@@ -12,7 +12,7 @@ namespace QtVsTools.Core.CMake
 {
     using Options;
     using VisualStudio;
-    using static Utils;
+    using static Common.Utils;
 
     public partial class CMakeProject : Concurrent<CMakeProject>
     {
diff --git a/QtVsTools.Core/CMake/CMakeProject.Presets.cs b/QtVsTools.Core/CMake/CMakeProject.Presets.cs
index 6fba5445..98f48e37 100644
--- a/QtVsTools.Core/CMake/CMakeProject.Presets.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.Presets.cs
@@ -13,7 +13,7 @@ using Newtonsoft.Json.Linq;
 namespace QtVsTools.Core.CMake
 {
     using static Instances;
-    using static Utils;
+    using static Common.Utils;
 
     public partial class CMakeProject : Concurrent<CMakeProject>
     {
diff --git a/QtVsTools.Core/CMake/CMakeProject.Variables.cs b/QtVsTools.Core/CMake/CMakeProject.Variables.cs
index bf9a9d20..3c5f545b 100644
--- a/QtVsTools.Core/CMake/CMakeProject.Variables.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.Variables.cs
@@ -11,8 +11,8 @@ using Microsoft.VisualStudio.Workspace.Indexing;
 
 namespace QtVsTools.Core.CMake
 {
-    using Common;
-    using static Common.EnumExt;
+    using QtVsTools.Common;
+    using static QtVsTools.Common.EnumExt;
 
     public partial class CMakeProject : Concurrent<CMakeProject>
     {
diff --git a/QtVsTools.Core/CMake/CMakeProject.cs b/QtVsTools.Core/CMake/CMakeProject.cs
index cc67af71..a860a697 100644
--- a/QtVsTools.Core/CMake/CMakeProject.cs
+++ b/QtVsTools.Core/CMake/CMakeProject.cs
@@ -29,7 +29,7 @@ namespace QtVsTools.Core
 namespace QtVsTools.Core.CMake
 {
     using Common;
-    using static Common.EnumExt;
+    using QtVsTools.Common;
     using static SyntaxAnalysis.RegExpr;
 
     public partial class CMakeProject : Concurrent<CMakeProject>
diff --git a/QtVsTools.Core/CommandLineParser.cs b/QtVsTools.Core/CommandLineParser.cs
index bcff2613..8702974c 100644
--- a/QtVsTools.Core/CommandLineParser.cs
+++ b/QtVsTools.Core/CommandLineParser.cs
@@ -14,7 +14,7 @@ using System.Text.RegularExpressions;
 namespace QtVsTools.Core.CommandLine
 {
     using MsBuild;
-    using static Utils;
+    using static Common.Utils;
 
     public class Parser
     {
diff --git a/QtVsTools.Core/Common/Utils.cs b/QtVsTools.Core/Common/Utils.cs
index 6159e765..55ee4925 100644
--- a/QtVsTools.Core/Common/Utils.cs
+++ b/QtVsTools.Core/Common/Utils.cs
@@ -10,7 +10,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace QtVsTools
+namespace QtVsTools.Core.Common
 {
     public static class Utils
     {
diff --git a/QtVsTools.Core/HelperFunctions.cs b/QtVsTools.Core/HelperFunctions.cs
index db401b41..0151f7dd 100644
--- a/QtVsTools.Core/HelperFunctions.cs
+++ b/QtVsTools.Core/HelperFunctions.cs
@@ -18,10 +18,10 @@ using Process = System.Diagnostics.Process;
 
 namespace QtVsTools.Core
 {
-    using Common;
     using MsBuild;
+    using QtVsTools.Common;
+    using static Common.Utils;
     using static SyntaxAnalysis.RegExpr;
-    using static Utils;
 
     public static class HelperFunctions
     {
diff --git a/QtVsTools.Core/MsBuild/ConversionReport.cs b/QtVsTools.Core/MsBuild/ConversionReport.cs
index 7773a9e6..296be1f0 100644
--- a/QtVsTools.Core/MsBuild/ConversionReport.cs
+++ b/QtVsTools.Core/MsBuild/ConversionReport.cs
@@ -20,7 +20,8 @@ using JsonFormatting = Newtonsoft.Json.Formatting;
 namespace QtVsTools.Core.MsBuild
 {
     using Common;
-    using static Utils;
+    using QtVsTools.Common;
+    using static Common.Utils;
     using static MsBuildProjectReaderWriter;
 
     public class ConversionReport
diff --git a/QtVsTools.Core/MsBuild/MsBuildProject.Build.cs b/QtVsTools.Core/MsBuild/MsBuildProject.Build.cs
index d4dbf483..335c877a 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProject.Build.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProject.Build.cs
@@ -24,10 +24,9 @@ using Thread = System.Threading.Thread;
 
 namespace QtVsTools.Core.MsBuild
 {
-    using Common;
     using Options;
     using VisualStudio;
-    using static Common.EnumExt;
+    using static QtVsTools.Common.EnumExt;
 
     public partial class MsBuildProject
     {
diff --git a/QtVsTools.Core/MsBuild/MsBuildProject.Messages.cs b/QtVsTools.Core/MsBuild/MsBuildProject.Messages.cs
index f5fc412c..dfd31e38 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProject.Messages.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProject.Messages.cs
@@ -11,6 +11,7 @@ using Task = System.Threading.Tasks.Task;
 
 namespace QtVsTools.Core.MsBuild
 {
+    using Common;
     using Options;
     using VisualStudio;
 
diff --git a/QtVsTools.Core/MsBuild/MsBuildProject.cs b/QtVsTools.Core/MsBuild/MsBuildProject.cs
index 7a3b66e2..ccda5569 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProject.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProject.cs
@@ -17,11 +17,11 @@ using Task = System.Threading.Tasks.Task;
 
 namespace QtVsTools.Core.MsBuild
 {
-    using Common;
     using Options;
+    using QtVsTools.Common;
     using VisualStudio;
+    using static Common.Utils;
     using static Instances;
-    using static Utils;
 
     /// <summary>
     /// QtProject holds the Qt specific properties for a Visual Studio project.
diff --git a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V2.cs b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V2.cs
index 3868fbd7..5dfe8a45 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V2.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V2.cs
@@ -13,7 +13,7 @@ using System.Xml.Linq;
 namespace QtVsTools.Core.MsBuild
 {
     using static HelperFunctions;
-    using static Utils;
+    using static Common.Utils;
 
     public partial class MsBuildProjectReaderWriter
     {
diff --git a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V3.cs b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V3.cs
index 8ae23f09..1eb30315 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V3.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.V3.cs
@@ -11,7 +11,7 @@ using System.Xml.Linq;
 namespace QtVsTools.Core.MsBuild
 {
     using static MsBuildProjectFormat;
-    using static Utils;
+    using static Common.Utils;
 
     public partial class MsBuildProjectReaderWriter
     {
diff --git a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.cs b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.cs
index 8b084862..8164348f 100644
--- a/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.cs
+++ b/QtVsTools.Core/MsBuild/MsBuildProjectReaderWriter.cs
@@ -21,7 +21,7 @@ namespace QtVsTools.Core.MsBuild
     using SyntaxAnalysis;
     using static HelperFunctions;
     using static SyntaxAnalysis.RegExpr;
-    using static Utils;
+    using static Common.Utils;
     using static MsBuildProjectFormat;
 
     public partial class MsBuildProjectReaderWriter
diff --git a/QtVsTools.Core/MsBuild/QtRepc.cs b/QtVsTools.Core/MsBuild/QtRepc.cs
index 1e761db9..4a800277 100644
--- a/QtVsTools.Core/MsBuild/QtRepc.cs
+++ b/QtVsTools.Core/MsBuild/QtRepc.cs
@@ -5,11 +5,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace QtVsTools.Core.MsBuild
 {
     using CommandLine;
+    using Common;
 
     public sealed class QtRepc : QtTool
     {
diff --git a/QtVsTools.Core/MsBuild/QtTool.cs b/QtVsTools.Core/MsBuild/QtTool.cs
index e90b12b0..b0d21901 100644
--- a/QtVsTools.Core/MsBuild/QtTool.cs
+++ b/QtVsTools.Core/MsBuild/QtTool.cs
@@ -9,6 +9,7 @@ using System.Linq;
 namespace QtVsTools.Core.MsBuild
 {
     using CommandLine;
+    using Common;
 
     public abstract class QtTool
     {
diff --git a/QtVsTools.Core/Notifications.cs b/QtVsTools.Core/Notifications.cs
index 387e5efe..3e1baed0 100644
--- a/QtVsTools.Core/Notifications.cs
+++ b/QtVsTools.Core/Notifications.cs
@@ -13,7 +13,7 @@ using Microsoft.VisualStudio.Shell;
 namespace QtVsTools.Core
 {
     using Common;
-    using MsBuild;
+    using QtVsTools.Common;
     using VisualStudio;
 
     public static class Notifications
diff --git a/QtVsTools.Core/Options/QtOptionsPage.cs b/QtVsTools.Core/Options/QtOptionsPage.cs
index 32a4cee4..a1e4d02e 100644
--- a/QtVsTools.Core/Options/QtOptionsPage.cs
+++ b/QtVsTools.Core/Options/QtOptionsPage.cs
@@ -19,8 +19,8 @@ namespace QtVsTools.Core.Options
 {
     using Core;
     using VisualStudio;
-    using static Utils;
-    using static Common.EnumExt;
+    using static Common.Utils;
+    using static QtVsTools.Common.EnumExt;
 
     public static class Options
     {
diff --git a/QtVsTools.Core/Options/QtVersionsPage.cs b/QtVsTools.Core/Options/QtVersionsPage.cs
index eec0ed3c..874d2c0a 100644
--- a/QtVsTools.Core/Options/QtVersionsPage.cs
+++ b/QtVsTools.Core/Options/QtVersionsPage.cs
@@ -13,11 +13,11 @@ using Microsoft.VisualStudio.Shell.Interop;
 
 namespace QtVsTools.Core.Options
 {
-    using Common;
     using Core;
+    using QtVsTools.Common;
     using VisualStudio;
+    using static Common.Utils;
     using static QtVersionsTable;
-    using static Utils;
 
     public class QtVersionsPage : UIElementDialogPage
     {
diff --git a/QtVsTools.Core/Options/QtVersionsTable.cs b/QtVsTools.Core/Options/QtVersionsTable.cs
index fedf542b..c1082272 100644
--- a/QtVsTools.Core/Options/QtVersionsTable.cs
+++ b/QtVsTools.Core/Options/QtVersionsTable.cs
@@ -24,11 +24,11 @@ using Shell32;
 
 namespace QtVsTools.Core.Options
 {
-    using Common;
     using Core;
+    using QtVsTools.Common;
     using VisualStudio;
-    using static Common.EnumExt;
-    using static Utils;
+    using static Common.Utils;
+    using static QtVsTools.Common.EnumExt;
 
     public enum BuildHost
     {
diff --git a/QtVsTools.Core/ProjectImport/ProjectImporter.cs b/QtVsTools.Core/ProjectImport/ProjectImporter.cs
index bd1211ec..9875df0e 100644
--- a/QtVsTools.Core/ProjectImport/ProjectImporter.cs
+++ b/QtVsTools.Core/ProjectImport/ProjectImporter.cs
@@ -18,7 +18,7 @@ using Microsoft.VisualStudio.VCProjectEngine;
 namespace QtVsTools.Core
 {
     using MsBuild;
-    using static Utils;
+    using static Common.Utils;
 
     public static class ProjectImporter
     {
diff --git a/QtVsTools.Core/QMake.cs b/QtVsTools.Core/QMake.cs
index 44649fde..034c2c32 100644
--- a/QtVsTools.Core/QMake.cs
+++ b/QtVsTools.Core/QMake.cs
@@ -13,7 +13,7 @@ using System.Text;
 namespace QtVsTools.Core
 {
     using VisualStudio;
-    using static Utils;
+    using static Common.Utils;
 
     public abstract class QMake
     {
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs
index 5491fa17..204065a0 100644
--- a/QtVsTools.Core/QtVersionManager.cs
+++ b/QtVsTools.Core/QtVersionManager.cs
@@ -15,6 +15,7 @@ using Microsoft.Win32;
 
 namespace QtVsTools.Core
 {
+    using Common;
     using MsBuild;
 
     public static partial class Instances
diff --git a/QtVsTools.Core/VcFilterExtensions.cs b/QtVsTools.Core/VcFilterExtensions.cs
index 73bb97c2..01ad9565 100644
--- a/QtVsTools.Core/VcFilterExtensions.cs
+++ b/QtVsTools.Core/VcFilterExtensions.cs
@@ -9,6 +9,8 @@ using Microsoft.VisualStudio.VCProjectEngine;
 
 namespace QtVsTools.Core
 {
+    using Common;
+
     public static class VcFilterExtensions
     {
         public static bool IsInFilter(this VCFile vcFile, FakeFilter fakeFilter)
diff --git a/QtVsTools.Package/CMake/AddCMakeItem.cs b/QtVsTools.Package/CMake/AddCMakeItem.cs
index 2ced8dea..6980dbff 100644
--- a/QtVsTools.Package/CMake/AddCMakeItem.cs
+++ b/QtVsTools.Package/CMake/AddCMakeItem.cs
@@ -19,6 +19,7 @@ using Constants = Microsoft.VisualStudio.OLE.Interop.Constants;
 namespace QtVsTools.Package.CMake
 {
     using QtVsTools.Core.CMake;
+    using QtVsTools.Core.Common;
     using VisualStudio;
 
     using CommandTable = QtMenus.Package;
diff --git a/QtVsTools.Package/CMake/CMakeVsProject.cs b/QtVsTools.Package/CMake/CMakeVsProject.cs
index ca9adc2f..6c0a6d80 100644
--- a/QtVsTools.Package/CMake/CMakeVsProject.cs
+++ b/QtVsTools.Package/CMake/CMakeVsProject.cs
@@ -11,16 +11,17 @@ using System.Reflection;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.TemplateWizard;
-using QtVsTools.Core;
-using QtVsTools.Wizards.Util;
 
 using IServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
 
 namespace QtVsTools.Package.CMake
 {
+    using Core;
     using Core.CMake;
     using Microsoft.VisualStudio.Workspace.VSIntegration.UI;
+    using QtVsTools.Core.Common;
     using VisualStudio;
+    using Wizards.Util;
 
     internal class CMakeVsProject : IVsProject
     {
diff --git a/QtVsTools.Package/MsBuild/ConversionReportViewer.cs b/QtVsTools.Package/MsBuild/ConversionReportViewer.cs
index c2e80dd6..2e67614e 100644
--- a/QtVsTools.Package/MsBuild/ConversionReportViewer.cs
+++ b/QtVsTools.Package/MsBuild/ConversionReportViewer.cs
@@ -24,7 +24,7 @@ namespace QtVsTools.Package.MsBuild
 {
     using Core.MsBuild;
     using VisualStudio;
-    using static Utils;
+    using static Core.Common.Utils;
 
     [Guid(GuidString)]
     public partial class ConversionReportViewer : IVsEditorFactory
diff --git a/QtVsTools.Package/Package/DteEventsHandler.cs b/QtVsTools.Package/Package/DteEventsHandler.cs
index 5b7459a0..d492db51 100644
--- a/QtVsTools.Package/Package/DteEventsHandler.cs
+++ b/QtVsTools.Package/Package/DteEventsHandler.cs
@@ -20,7 +20,7 @@ namespace QtVsTools
     using Core.CMake;
     using Core.MsBuild;
     using VisualStudio;
-    using static Utils;
+    using static Core.Common.Utils;
 
     internal class DteEventsHandler : IVsDebuggerEvents
     {
diff --git a/QtVsTools.Package/Package/QtHelpLinkChooser.xaml.cs b/QtVsTools.Package/Package/QtHelpLinkChooser.xaml.cs
index caa0dd54..0c639c93 100644
--- a/QtVsTools.Package/Package/QtHelpLinkChooser.xaml.cs
+++ b/QtVsTools.Package/Package/QtHelpLinkChooser.xaml.cs
@@ -3,7 +3,6 @@
  SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 ***************************************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
@@ -16,7 +15,7 @@ using QtVsTools.VisualStudio;
 
 namespace QtVsTools
 {
-    using static Utils;
+    using static Core.Common.Utils;
 
     partial class QtHelpLinkChooser : DialogWindow
     {
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Breakpoint.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Breakpoint.cs
index 32cf653d..6902f57f 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Breakpoint.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7Breakpoint.cs
@@ -3,7 +3,6 @@
  SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 ***************************************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -13,7 +12,7 @@ using Microsoft.VisualStudio.Debugger.Interop;
 
 namespace QtVsTools.Qml.Debug.AD7
 {
-    using static Utils;
+    using static Core.Common.Utils;
 
     sealed partial class PendingBreakpoint : Disposable,
 
diff --git a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7CodeContext.cs b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7CodeContext.cs
index ae8f3fd5..1759072d 100644
--- a/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7CodeContext.cs
+++ b/QtVsTools.Package/QML/Debugging/AD7/QmlDebugAD7CodeContext.cs
@@ -10,7 +10,7 @@ using Microsoft.VisualStudio.Debugger.Interop;
 
 namespace QtVsTools.Qml.Debug.AD7
 {
-    using static Utils;
+    using static Core.Common.Utils;
 
     sealed partial class CodeContext :
 
diff --git a/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs b/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
index 2235af73..7c8d6032 100644
--- a/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
+++ b/QtVsTools.Package/QML/Debugging/QmlDebugLauncher.cs
@@ -27,10 +27,10 @@ namespace QtVsTools.Qml.Debug
     using Core.MsBuild;
     using SyntaxAnalysis;
     using VisualStudio;
+    using static Core.Common.Utils;
     using static Core.Instances;
     using static Instances;
     using static SyntaxAnalysis.RegExpr;
-    using static Utils;
 
     class Launcher : Disposable, IDebugEventCallback2
     {
diff --git a/QtVsTools.Package/QML/Debugging/QmlFileSystem.cs b/QtVsTools.Package/QML/Debugging/QmlFileSystem.cs
index 4e6b9601..0691e643 100644
--- a/QtVsTools.Package/QML/Debugging/QmlFileSystem.cs
+++ b/QtVsTools.Package/QML/Debugging/QmlFileSystem.cs
@@ -14,7 +14,7 @@ using System.Xml.Linq;
 namespace QtVsTools.Qml.Debug
 {
     using Core;
-    using static Utils;
+    using static Core.Common.Utils;
 
     struct QmlFile
     {
diff --git a/QtVsTools.Package/QtVsToolsPackage.cs b/QtVsTools.Package/QtVsToolsPackage.cs
index f826d903..1f849b6f 100644
--- a/QtVsTools.Package/QtVsToolsPackage.cs
+++ b/QtVsTools.Package/QtVsToolsPackage.cs
@@ -29,7 +29,7 @@ namespace QtVsTools
     using Qml.Debug;
     using VisualStudio;
 
-    using static Utils;
+    using static QtVsTools.Core.Common.Utils;
     using static SyntaxAnalysis.RegExpr;
 
     public static partial class Instances
diff --git a/QtVsTools.Wizards/ItemWizard/Translation/TranslationPage.xaml.cs b/QtVsTools.Wizards/ItemWizard/Translation/TranslationPage.xaml.cs
index b340a7db..f119219e 100644
--- a/QtVsTools.Wizards/ItemWizard/Translation/TranslationPage.xaml.cs
+++ b/QtVsTools.Wizards/ItemWizard/Translation/TranslationPage.xaml.cs
@@ -3,7 +3,6 @@
  SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 ***************************************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
@@ -15,7 +14,7 @@ namespace QtVsTools.Wizards.ItemWizard
 {
     using Common;
     using VisualStudio;
-    using static Utils;
+    using static Core.Common.Utils;
 
     public partial class TranslationPage : WizardPage
     {
diff --git a/QtVsTools.Wizards/ProjectWizard/ConfigPage.xaml.cs b/QtVsTools.Wizards/ProjectWizard/ConfigPage.xaml.cs
index d400c5c1..2ebc4e70 100644
--- a/QtVsTools.Wizards/ProjectWizard/ConfigPage.xaml.cs
+++ b/QtVsTools.Wizards/ProjectWizard/ConfigPage.xaml.cs
@@ -20,7 +20,7 @@ namespace QtVsTools.Wizards.ProjectWizard
     using QtVsTools.Common;
 
     using static Common.WizardData;
-    using static Utils;
+    using static Core.Common.Utils;
 
     public partial class ConfigPage : WizardPage
     {
diff --git a/QtVsTools.Wizards/ProjectWizard/ProjectTemplateWizard.CMake.cs b/QtVsTools.Wizards/ProjectWizard/ProjectTemplateWizard.CMake.cs
index f1c3b500..8c7a19a8 100644
--- a/QtVsTools.Wizards/ProjectWizard/ProjectTemplateWizard.CMake.cs
+++ b/QtVsTools.Wizards/ProjectWizard/ProjectTemplateWizard.CMake.cs
@@ -16,7 +16,7 @@ namespace QtVsTools.Wizards.ProjectWizard
     using Core;
     using Core.CMake;
     using Json;
-    using static Utils;
+    using static Core.Common.Utils;
     using static QtVsTools.Common.EnumExt;
 
     public abstract partial class ProjectTemplateWizard : IWizard
diff --git a/Tests/Test_QtVsTools.Core/Test_Utils.cs b/Tests/Test_QtVsTools.Core/Test_Utils.cs
index 2569f912..0421be74 100644
--- a/Tests/Test_QtVsTools.Core/Test_Utils.cs
+++ b/Tests/Test_QtVsTools.Core/Test_Utils.cs
@@ -6,11 +6,12 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace QtVsTools.Test.Core
 {
+    using QtVsTools.Core.Common;
+
     [TestClass]
     public class Test_Utils
     {