Skip to content

Portable Tool for an Ideal Windows Setup

structuring files

Greedeks2b185cb0b068
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index d5e4fc04..19a8e078 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using System;
using System.Globalization;
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
index eb22e9a3..7ac2d8ba 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
@@ -1,6 +1,6 @@
using GTweak.Core.Model;
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using System.Collections.ObjectModel;
using System.Linq;
using System.Windows;
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index b1da9033..47dca007 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -264,24 +264,24 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="Utilities\Control\BlockRunTweaker.cs" />
- <Compile Include="Utilities\Control\ErrorLogging.cs" />
+ <Compile Include="Utilities\Controls\BlockRunTweaker.cs" />
+ <Compile Include="Utilities\Controls\ErrorLogging.cs" />
<Compile Include="Utilities\Helpers\DisablingWinKeys.cs" />
<Compile Include="Utilities\Helpers\CommandExecutor.cs" />
- <Compile Include="Utilities\Helpers\ExplorerManager.cs" />
+ <Compile Include="Utilities\Helpers\Managers\ExplorerManager.cs" />
<Compile Include="Utilities\Helpers\Storage\WinKeyStorage.cs" />
- <Compile Include="Utilities\Helpers\TaskSchedulerManager.cs" />
- <Compile Include="Utilities\Helpers\UnarchiveManager.cs" />
+ <Compile Include="Utilities\Helpers\Managers\TaskSchedulerManager.cs" />
+ <Compile Include="Utilities\Helpers\Managers\UnarchiveManager.cs" />
<Compile Include="Utilities\Helpers\BackgroundQueue.cs" />
<Compile Include="Utilities\Helpers\RegistryHelp.cs" />
- <Compile Include="Utilities\Control\SettingsRepository.cs" />
+ <Compile Include="Utilities\Controls\SettingsRepository.cs" />
<Compile Include="Utilities\Helpers\TakingOwnership.cs" />
<Compile Include="Utilities\Helpers\Storage\NotifActionsStorage.cs" />
<Compile Include="Utilities\Tweaks\ClearingMemory.cs" />
- <Compile Include="Utilities\Helpers\INIManager.cs" />
+ <Compile Include="Utilities\Helpers\Managers\INIManager.cs" />
<Compile Include="Utilities\Configuration\MonitoringSystem.cs" />
<Compile Include="Utilities\Configuration\SystemDiagnostics.cs" />
- <Compile Include="Utilities\Control\ViewNotification.cs" />
+ <Compile Include="Utilities\Controls\ViewNotification.cs" />
<Compile Include="Utilities\Helpers\TrustedInstaller.cs" />
<Compile Include="Utilities\Tweaks\ConfidentialityTweaks.cs" />
<Compile Include="Utilities\Tweaks\DefenderManager\BackupRights.cs" />
diff --git a/.Source/GTweak/Utilities/Configuration/MonitoringSystem.cs b/.Source/GTweak/Utilities/Configuration/MonitoringSystem.cs
index 80cadd4a..d032c50c 100644
--- a/.Source/GTweak/Utilities/Configuration/MonitoringSystem.cs
+++ b/.Source/GTweak/Utilities/Configuration/MonitoringSystem.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 944be007..212a3486 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using Microsoft.Win32;
using Newtonsoft.Json;
diff --git a/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
similarity index 98%
rename from .Source/GTweak/Utilities/Control/BlockRunTweaker.cs
rename to .Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
index c81787d4..53e4dafe 100644
--- a/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs
+++ b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs
@@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
-namespace GTweak.Utilities.Control
+namespace GTweak.Utilities.Controls
{
internal sealed class BlockRunTweaker
{
diff --git a/.Source/GTweak/Utilities/Control/ErrorLogging.cs b/.Source/GTweak/Utilities/Controls/ErrorLogging.cs
similarity index 97%
rename from .Source/GTweak/Utilities/Control/ErrorLogging.cs
rename to .Source/GTweak/Utilities/Controls/ErrorLogging.cs
index f21472a3..b831c5ba 100644
--- a/.Source/GTweak/Utilities/Control/ErrorLogging.cs
+++ b/.Source/GTweak/Utilities/Controls/ErrorLogging.cs
@@ -4,7 +4,7 @@ using System.IO;
using System.Text;
using System.Threading.Tasks;
-namespace GTweak.Utilities.Control
+namespace GTweak.Utilities.Controls
{
internal class ErrorLogging
{
diff --git a/.Source/GTweak/Utilities/Control/SettingsRepository.cs b/.Source/GTweak/Utilities/Controls/SettingsRepository.cs
similarity index 99%
rename from .Source/GTweak/Utilities/Control/SettingsRepository.cs
rename to .Source/GTweak/Utilities/Controls/SettingsRepository.cs
index 81396b43..9a04dc31 100644
--- a/.Source/GTweak/Utilities/Control/SettingsRepository.cs
+++ b/.Source/GTweak/Utilities/Controls/SettingsRepository.cs
@@ -1,4 +1,5 @@
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.Windows;
using Microsoft.Win32;
using System;
@@ -8,7 +9,7 @@ using System.Linq;
using System.Reflection;
using System.Runtime.InteropServices;
-namespace GTweak.Utilities.Control
+namespace GTweak.Utilities.Controls
{
[StructLayout(LayoutKind.Sequential)]
internal readonly struct StoragePaths
diff --git a/.Source/GTweak/Utilities/Control/ViewNotification.cs b/.Source/GTweak/Utilities/Controls/ViewNotification.cs
similarity index 97%
rename from .Source/GTweak/Utilities/Control/ViewNotification.cs
rename to .Source/GTweak/Utilities/Controls/ViewNotification.cs
index 57e776a4..b3488abe 100644
--- a/.Source/GTweak/Utilities/Control/ViewNotification.cs
+++ b/.Source/GTweak/Utilities/Controls/ViewNotification.cs
@@ -2,7 +2,7 @@
using System.Threading.Tasks;
using System.Windows;
-namespace GTweak.Utilities.Control
+namespace GTweak.Utilities.Controls
{
internal sealed class ViewNotification
{
diff --git a/.Source/GTweak/Utilities/Helpers/ExplorerManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
similarity index 96%
rename from .Source/GTweak/Utilities/Helpers/ExplorerManager.cs
rename to .Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
index ca6acb93..9d833427 100644
--- a/.Source/GTweak/Utilities/Helpers/ExplorerManager.cs
+++ b/.Source/GTweak/Utilities/Helpers/Managers/ExplorerManager.cs
@@ -1,11 +1,11 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
-namespace GTweak.Utilities.Helpers
+namespace GTweak.Utilities.Helpers.Managers
{
internal class ExplorerManager
{
diff --git a/.Source/GTweak/Utilities/Helpers/INIManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/INIManager.cs
similarity index 98%
rename from .Source/GTweak/Utilities/Helpers/INIManager.cs
rename to .Source/GTweak/Utilities/Helpers/Managers/INIManager.cs
index 2700519f..34cd9af8 100644
--- a/.Source/GTweak/Utilities/Helpers/INIManager.cs
+++ b/.Source/GTweak/Utilities/Helpers/Managers/INIManager.cs
@@ -4,7 +4,7 @@ using System.IO;
using System.Runtime.InteropServices;
using System.Text;
-namespace GTweak.Utilities.Helpers
+namespace GTweak.Utilities.Helpers.Managers
{
internal sealed class INIManager
{
diff --git a/.Source/GTweak/Utilities/Helpers/TaskSchedulerManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/TaskSchedulerManager.cs
similarity index 97%
rename from .Source/GTweak/Utilities/Helpers/TaskSchedulerManager.cs
rename to .Source/GTweak/Utilities/Helpers/Managers/TaskSchedulerManager.cs
index 37de3564..85038ede 100644
--- a/.Source/GTweak/Utilities/Helpers/TaskSchedulerManager.cs
+++ b/.Source/GTweak/Utilities/Helpers/Managers/TaskSchedulerManager.cs
@@ -1,9 +1,9 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers.Storage;
using System.Linq;
using System.Threading.Tasks;
-namespace GTweak.Utilities.Helpers
+namespace GTweak.Utilities.Helpers.Managers
{
internal class TaskSchedulerManager : TaskStorage
{
diff --git a/.Source/GTweak/Utilities/Helpers/UnarchiveManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/UnarchiveManager.cs
similarity index 94%
rename from .Source/GTweak/Utilities/Helpers/UnarchiveManager.cs
rename to .Source/GTweak/Utilities/Helpers/Managers/UnarchiveManager.cs
index 1817809b..d87225ae 100644
--- a/.Source/GTweak/Utilities/Helpers/UnarchiveManager.cs
+++ b/.Source/GTweak/Utilities/Helpers/Managers/UnarchiveManager.cs
@@ -1,7 +1,7 @@
using System.IO;
using System.IO.Compression;
-namespace GTweak.Utilities.Helpers
+namespace GTweak.Utilities.Helpers.Managers
{
internal sealed class UnarchiveManager
{
diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
index ef71bdf3..b1574e66 100644
--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
diff --git a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
index cbfec96e..8f04ab74 100644
--- a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using System;
using System.Collections.Generic;
using System.ComponentModel;
diff --git a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
index ca8b11bb..6ffe0770 100644
--- a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
@@ -1,7 +1,8 @@
using GTweak.Properties;
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.View;
using Microsoft.Win32;
using System;
diff --git a/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs b/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs
index 2f42143e..f09d8c75 100644
--- a/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs
+++ b/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs
@@ -1,5 +1,5 @@
-using GTweak.Utilities.Control;
-using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Controls;
+using GTweak.Utilities.Helpers.Managers;
using Microsoft.Win32;
using Newtonsoft.Json;
using System;
diff --git a/.Source/GTweak/Utilities/Tweaks/DefenderManager/WindowsDefender.cs b/.Source/GTweak/Utilities/Tweaks/DefenderManager/WindowsDefender.cs
index b6530452..6bef9452 100644
--- a/.Source/GTweak/Utilities/Tweaks/DefenderManager/WindowsDefender.cs
+++ b/.Source/GTweak/Utilities/Tweaks/DefenderManager/WindowsDefender.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Windows;
using Microsoft.Win32;
diff --git a/.Source/GTweak/Utilities/Tweaks/Firewall.cs b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
index 5edda969..61a02c08 100644
--- a/.Source/GTweak/Utilities/Tweaks/Firewall.cs
+++ b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
@@ -1,5 +1,5 @@
-using GTweak.Utilities.Control;
-using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Controls;
+using GTweak.Utilities.Helpers.Managers;
using NetFwTypeLib;
using System;
using System.Collections.Generic;
diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
index 743ab478..3452b82c 100644
--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
@@ -1,6 +1,7 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.View;
using Microsoft.Win32;
using System;
diff --git a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
index 478976a4..14eb2e3e 100644
--- a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.View;
using Microsoft.Win32;
using System;
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs b/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs
index 76d2493b..a573f26b 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using Microsoft.Win32;
using System;
using System.Management;
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index d6aae42e..af4c8370 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.Utilities.Tweaks.DefenderManager;
using GTweak.View;
using Microsoft.Win32;
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 7f206fe7..1275d83b 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
diff --git a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
index 7d1b7664..f5402bc2 100644
--- a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
@@ -1,5 +1,5 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Helpers.Storage;
using GTweak.Windows;
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml.cs b/.Source/GTweak/View/ConfidentialityView.xaml.cs
index 812b67ed..0c344a35 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml.cs
+++ b/.Source/GTweak/View/ConfidentialityView.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Assets.UserControl;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers.Storage;
using GTweak.Utilities.Tweaks;
using System;
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index 91b7dcf3..95abe43d 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -1,6 +1,6 @@
using GTweak.Core.ViewModel;
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using System;
using System.Collections.Generic;
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index a546ae81..6fec4deb 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -1,8 +1,8 @@
using GTweak.Assets.UserControl;
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
-using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers.Animation;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.Utilities.Helpers.Storage;
using GTweak.Utilities.Tweaks;
using System;
diff --git a/.Source/GTweak/View/MoreView.xaml.cs b/.Source/GTweak/View/MoreView.xaml.cs
index 07fa904f..ef1412df 100644
--- a/.Source/GTweak/View/MoreView.xaml.cs
+++ b/.Source/GTweak/View/MoreView.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Tweaks;
using GTweak.Windows;
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.cs
index 527818cc..eb5f6cf2 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PakagesView.xaml.cs
@@ -1,5 +1,6 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.Utilities.Tweaks;
using System;
using System.Collections.Generic;
diff --git a/.Source/GTweak/View/ServicesView.xaml.cs b/.Source/GTweak/View/ServicesView.xaml.cs
index ae0643af..f5f795b0 100644
--- a/.Source/GTweak/View/ServicesView.xaml.cs
+++ b/.Source/GTweak/View/ServicesView.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Assets.UserControl;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Tweaks;
using System;
using System.Threading.Tasks;
diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.cs
index f8281521..01a20486 100644
--- a/.Source/GTweak/View/SystemView.xaml.cs
+++ b/.Source/GTweak/View/SystemView.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Assets.UserControl;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers.Storage;
using GTweak.Utilities.Tweaks;
using System;
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.cs
index a28d6047..363bc40c 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs
+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs
@@ -1,5 +1,5 @@
-using GTweak.Utilities.Control;
-using GTweak.Utilities.Helpers;
+using GTweak.Utilities.Controls;
+using GTweak.Utilities.Helpers.Managers;
using GTweak.Utilities.Helpers.Storage;
using GTweak.Utilities.Tweaks;
using GTweak.Utilities.Tweaks.DefenderManager;
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index a48bb937..ecce3114 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Helpers.Animation;
using GTweak.Utilities.Tweaks;
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 2320a2ed..a4360660 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers.Animation;
using GTweak.Utilities.Tweaks;
using GTweak.Windows;
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml.cs b/.Source/GTweak/Windows/MessageWindow.xaml.cs
index f9f97c4f..4cdc456d 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MessageWindow.xaml.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using System;
using System.ComponentModel;
using System.Text.RegularExpressions;
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
index 654d5da9..358d9b74 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using System;
using System.ComponentModel;
diff --git a/.Source/GTweak/Windows/RebootWindow.xaml.cs b/.Source/GTweak/Windows/RebootWindow.xaml.cs
index f72da319..97da1683 100644
--- a/.Source/GTweak/Windows/RebootWindow.xaml.cs
+++ b/.Source/GTweak/Windows/RebootWindow.xaml.cs
@@ -1,4 +1,4 @@
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using System;
using System.Windows;
using System.Windows.Controls;
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
index 4a3bd8d9..c5496029 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
@@ -1,5 +1,5 @@
using GTweak.Utilities.Configuration;
-using GTweak.Utilities.Control;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using System;
using System.ComponentModel;