Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

refactor: restructured project

fatDuckc4daad5a3473
diff --git a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
index 650fd4e..2cc24d5 100644
--- a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
+++ b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
@@ -1,11 +1,11 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Abstractions;
using Newtonsoft.Json;
-using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Revert;
-using optimizerDuck.Core.Models.Revert.Steps;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Shared.Helpers;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Revert;
+using optimizerDuck.Domain.Revert.Steps;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
namespace optimizerDuck.Test.Services.Managers;
diff --git a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
index 9b56c41..ac376f1 100644
--- a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
@@ -1,10 +1,10 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Abstractions;
using Newtonsoft.Json.Linq;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.UI;
-using OptimizationState = optimizerDuck.Core.Models.UI.OptimizationState;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.UI;
+using OptimizationState = optimizerDuck.Domain.UI.OptimizationState;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/OptimizationServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
index 160e3d8..cb6442e 100644
--- a/optimizerDuck.Test/Services/OptimizationServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
@@ -1,12 +1,12 @@
-using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging.Abstractions;
using Newtonsoft.Json;
-using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Revert;
-using optimizerDuck.Core.Models.Revert.Steps;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Shared.Helpers;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Revert;
+using optimizerDuck.Domain.Revert.Steps;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using Wpf.Ui;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
index 303b7f0..4555753 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
@@ -1,13 +1,13 @@
-using System;
+using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Win32;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.OptimizationServices;
using Xunit;
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index 0bd50fd..18e57b7 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -9,13 +9,13 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Extensions;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Models.Config;
+using optimizerDuck.Domain.Configuration;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
using optimizerDuck.UI.ViewModels.Pages;
-using optimizerDuck.UI.Views.Pages;
-using optimizerDuck.UI.Views.Windows;
+using optimizerDuck.UI.Pages;
+using optimizerDuck.UI.Windows;
using Serilog;
using Serilog.Events;
using Serilog.Formatting;
diff --git a/optimizerDuck/Common/Converters/BooleanConverter.cs b/optimizerDuck/Common/Converters/BooleanConverter.cs
index 5f349fe..941430c 100644
--- a/optimizerDuck/Common/Converters/BooleanConverter.cs
+++ b/optimizerDuck/Common/Converters/BooleanConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/BooleanToVisibilityConverter.cs b/optimizerDuck/Common/Converters/BooleanToVisibilityConverter.cs
index 0846d79..74a367f 100644
--- a/optimizerDuck/Common/Converters/BooleanToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/BooleanToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/EmptyWhileNotLoadingConverter.cs b/optimizerDuck/Common/Converters/EmptyWhileNotLoadingConverter.cs
index eba6762..b36b919 100644
--- a/optimizerDuck/Common/Converters/EmptyWhileNotLoadingConverter.cs
+++ b/optimizerDuck/Common/Converters/EmptyWhileNotLoadingConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows;
using System.Windows.Data;
diff --git a/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs b/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs
index 58ffdec..41ab8db 100644
--- a/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows;
using System.Windows.Data;
diff --git a/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs b/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs
index 7a21a28..603bf49 100644
--- a/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows;
using System.Windows.Data;
diff --git a/optimizerDuck/Common/Converters/InverseBooleanConverter.cs b/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
index 8fe5ecc..68ffc95 100644
--- a/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
+++ b/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/InverseBooleanToVisibilityConverter.cs b/optimizerDuck/Common/Converters/InverseBooleanToVisibilityConverter.cs
index bd17149..e7310d0 100644
--- a/optimizerDuck/Common/Converters/InverseBooleanToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/InverseBooleanToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/MBToGBConverter.cs b/optimizerDuck/Common/Converters/MBToGBConverter.cs
index c1858c7..f1b47f0 100644
--- a/optimizerDuck/Common/Converters/MBToGBConverter.cs
+++ b/optimizerDuck/Common/Converters/MBToGBConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs b/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs
index edc900c..2f6661d 100644
--- a/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows;
using System.Windows.Data;
diff --git a/optimizerDuck/Common/Converters/SizeToBrushConverter.cs b/optimizerDuck/Common/Converters/SizeToBrushConverter.cs
index e3690ba..d1bdfea 100644
--- a/optimizerDuck/Common/Converters/SizeToBrushConverter.cs
+++ b/optimizerDuck/Common/Converters/SizeToBrushConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Media;
using optimizerDuck.Common.Helpers;
diff --git a/optimizerDuck/Common/Converters/ThemeToIndexConverter.cs b/optimizerDuck/Common/Converters/ThemeToIndexConverter.cs
index f018804..421921d 100644
--- a/optimizerDuck/Common/Converters/ThemeToIndexConverter.cs
+++ b/optimizerDuck/Common/Converters/ThemeToIndexConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
using Wpf.Ui.Appearance;
diff --git a/optimizerDuck/Common/Converters/WidthToColumnConverter.cs b/optimizerDuck/Common/Converters/WidthToColumnConverter.cs
index 650565a..8fbfe65 100644
--- a/optimizerDuck/Common/Converters/WidthToColumnConverter.cs
+++ b/optimizerDuck/Common/Converters/WidthToColumnConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
namespace optimizerDuck.Common.Converters;
diff --git a/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs b/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs
index e2bb964..e1fe13d 100644
--- a/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs
+++ b/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows;
using System.Windows.Data;
diff --git a/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cs
index 77f8383..8855180 100644
--- a/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cs
+++ b/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cs
@@ -1,9 +1,9 @@
-using System.Reflection;
+using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
using optimizerDuck.Services;
using optimizerDuck.UI.ViewModels.Pages;
diff --git a/optimizerDuck/Common/Extensions/LanguageExtensions.cs b/optimizerDuck/Common/Extensions/LanguageExtensions.cs
index 8b28894..b8cc59d 100644
--- a/optimizerDuck/Common/Extensions/LanguageExtensions.cs
+++ b/optimizerDuck/Common/Extensions/LanguageExtensions.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
using optimizerDuck.Services.Managers;
diff --git a/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
index a2f9ea1..19d7866 100644
--- a/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
+++ b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
@@ -1,11 +1,11 @@
-using System.Reflection;
+using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Config;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Configuration;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using Wpf.Ui;
diff --git a/optimizerDuck/Common/Extensions/StringExtensions.cs b/optimizerDuck/Common/Extensions/StringExtensions.cs
index 028052f..6d8f72d 100644
--- a/optimizerDuck/Common/Extensions/StringExtensions.cs
+++ b/optimizerDuck/Common/Extensions/StringExtensions.cs
@@ -1,4 +1,4 @@
-using System.Management.Automation;
+using System.Management.Automation;
using System.Text;
using System.Xml.Linq;
diff --git a/optimizerDuck/Common/Helpers/ReflectionHelper.cs b/optimizerDuck/Common/Helpers/ReflectionHelper.cs
index dc94277..b70a29a 100644
--- a/optimizerDuck/Common/Helpers/ReflectionHelper.cs
+++ b/optimizerDuck/Common/Helpers/ReflectionHelper.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
namespace optimizerDuck.Common.Helpers;
diff --git a/optimizerDuck/Common/Helpers/Shared.cs b/optimizerDuck/Common/Helpers/Shared.cs
index 4f555bd..305d729 100644
--- a/optimizerDuck/Common/Helpers/Shared.cs
+++ b/optimizerDuck/Common/Helpers/Shared.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.IO;
namespace optimizerDuck.Common.Helpers;
@@ -157,4 +157,4 @@ public static class Shared
public static string RevertDirectory =>
Path.Combine(RootDirectory, "Revert");
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Common/Helpers/ThemeResource.cs b/optimizerDuck/Common/Helpers/ThemeResource.cs
index 6f2086d..b793c87 100644
--- a/optimizerDuck/Common/Helpers/ThemeResource.cs
+++ b/optimizerDuck/Common/Helpers/ThemeResource.cs
@@ -1,4 +1,4 @@
-using System.Windows;
+using System.Windows;
namespace optimizerDuck.Common.Helpers;
diff --git a/optimizerDuck/Core/Interfaces/IFeature.cs b/optimizerDuck/Domain/Abstractions/IFeature.cs
similarity index 78%
rename from optimizerDuck/Core/Interfaces/IFeature.cs
rename to optimizerDuck/Domain/Abstractions/IFeature.cs
index 378cd50..250a006 100644
--- a/optimizerDuck/Core/Interfaces/IFeature.cs
+++ b/optimizerDuck/Domain/Abstractions/IFeature.cs
@@ -1,6 +1,6 @@
-using Wpf.Ui.Controls;
+using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
public interface IFeature
{
diff --git a/optimizerDuck/Core/Interfaces/IFeatureCategory.cs b/optimizerDuck/Domain/Abstractions/IFeatureCategory.cs
similarity index 71%
rename from optimizerDuck/Core/Interfaces/IFeatureCategory.cs
rename to optimizerDuck/Domain/Abstractions/IFeatureCategory.cs
index 9318431..9884c82 100644
--- a/optimizerDuck/Core/Interfaces/IFeatureCategory.cs
+++ b/optimizerDuck/Domain/Abstractions/IFeatureCategory.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Models.UI;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.UI;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
public interface IFeatureCategory
{
diff --git a/optimizerDuck/Core/Interfaces/IOptimization.cs b/optimizerDuck/Domain/Abstractions/IOptimization.cs
similarity index 87%
rename from optimizerDuck/Core/Interfaces/IOptimization.cs
rename to optimizerDuck/Domain/Abstractions/IOptimization.cs
index 8310db2..9c36a31 100644
--- a/optimizerDuck/Core/Interfaces/IOptimization.cs
+++ b/optimizerDuck/Domain/Abstractions/IOptimization.cs
@@ -1,8 +1,8 @@
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.UI;
-using OptimizationState = optimizerDuck.Core.Models.UI.OptimizationState;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.UI;
+using OptimizationState = optimizerDuck.Domain.UI.OptimizationState;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
/// <summary>
/// Defines a single optimization that can be applied to the system.
diff --git a/optimizerDuck/Core/Interfaces/IOptimizationCategory.cs b/optimizerDuck/Domain/Abstractions/IOptimizationCategory.cs
similarity index 83%
rename from optimizerDuck/Core/Interfaces/IOptimizationCategory.cs
rename to optimizerDuck/Domain/Abstractions/IOptimizationCategory.cs
index 59176a9..bfeef8f 100644
--- a/optimizerDuck/Core/Interfaces/IOptimizationCategory.cs
+++ b/optimizerDuck/Domain/Abstractions/IOptimizationCategory.cs
@@ -1,7 +1,7 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Models.UI;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.UI;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
/// <summary>
/// Defines a category that groups related optimizations together.
diff --git a/optimizerDuck/Core/Interfaces/IRevertStep.cs b/optimizerDuck/Domain/Abstractions/IRevertStep.cs
similarity index 91%
rename from optimizerDuck/Core/Interfaces/IRevertStep.cs
rename to optimizerDuck/Domain/Abstractions/IRevertStep.cs
index 76d4631..92c4817 100644
--- a/optimizerDuck/Core/Interfaces/IRevertStep.cs
+++ b/optimizerDuck/Domain/Abstractions/IRevertStep.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
/// <summary>
/// Defines a single step that can be executed to revert an optimization.
diff --git a/optimizerDuck/Core/Interfaces/IWindow.cs b/optimizerDuck/Domain/Abstractions/IWindow.cs
similarity index 84%
rename from optimizerDuck/Core/Interfaces/IWindow.cs
rename to optimizerDuck/Domain/Abstractions/IWindow.cs
index d7970f6..2b0d17b 100644
--- a/optimizerDuck/Core/Interfaces/IWindow.cs
+++ b/optimizerDuck/Domain/Abstractions/IWindow.cs
@@ -1,6 +1,6 @@
-using System.Windows;
+using System.Windows;
-namespace optimizerDuck.Core.Interfaces;
+namespace optimizerDuck.Domain.Abstractions;
/// <summary>
/// Defines the contract for a window that can be shown and observed for load events.
diff --git a/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs b/optimizerDuck/Domain/Attributes/FeatureAttribute.cs
similarity index 86%
rename from optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs
rename to optimizerDuck/Domain/Attributes/FeatureAttribute.cs
index c7474e1..effe275 100644
--- a/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs
+++ b/optimizerDuck/Domain/Attributes/FeatureAttribute.cs
@@ -1,6 +1,6 @@
-using Wpf.Ui.Controls;
+using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.Attributes;
+namespace optimizerDuck.Domain.Attributes;
[AttributeUsage(AttributeTargets.Class, Inherited = false)]
public sealed class FeatureAttribute : Attribute
diff --git a/optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.cs b/optimizerDuck/Domain/Attributes/FeatureCategoryAttribute.cs
similarity index 75%
rename from optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.cs
rename to optimizerDuck/Domain/Attributes/FeatureCategoryAttribute.cs
index 25e857c..127d7da 100644
--- a/optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.cs
+++ b/optimizerDuck/Domain/Attributes/FeatureCategoryAttribute.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Attributes;
+namespace optimizerDuck.Domain.Attributes;
[AttributeUsage(AttributeTargets.Class, Inherited = false)]
public class FeatureCategoryAttribute : Attribute
diff --git a/optimizerDuck/Core/Models/Attributes/OptimizationAttribute.cs b/optimizerDuck/Domain/Attributes/OptimizationAttribute.cs
similarity index 89%
rename from optimizerDuck/Core/Models/Attributes/OptimizationAttribute.cs
rename to optimizerDuck/Domain/Attributes/OptimizationAttribute.cs
index 5cb3c38..dec0d5a 100644
--- a/optimizerDuck/Core/Models/Attributes/OptimizationAttribute.cs
+++ b/optimizerDuck/Domain/Attributes/OptimizationAttribute.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.UI;
-namespace optimizerDuck.Core.Models.Attributes;
+namespace optimizerDuck.Domain.Attributes;
/// <summary>
/// Marks a class as an optimization and provides metadata used for registration and display.
diff --git a/optimizerDuck/Core/Models/Attributes/OptimizationCategoryAttribute.cs b/optimizerDuck/Domain/Attributes/OptimizationCategoryAttribute.cs
similarity index 91%
rename from optimizerDuck/Core/Models/Attributes/OptimizationCategoryAttribute.cs
rename to optimizerDuck/Domain/Attributes/OptimizationCategoryAttribute.cs
index efd539d..4f93ff4 100644
--- a/optimizerDuck/Core/Models/Attributes/OptimizationCategoryAttribute.cs
+++ b/optimizerDuck/Domain/Attributes/OptimizationCategoryAttribute.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Attributes;
+namespace optimizerDuck.Domain.Attributes;
/// <summary>
/// Associates an optimization category with its corresponding UI page type
diff --git a/optimizerDuck/Core/Models/Config/AppSettings.cs b/optimizerDuck/Domain/Configuration/AppSettings.cs
similarity index 97%
rename from optimizerDuck/Core/Models/Config/AppSettings.cs
rename to optimizerDuck/Domain/Configuration/AppSettings.cs
index dd81d06..7ec1eb4 100644
--- a/optimizerDuck/Core/Models/Config/AppSettings.cs
+++ b/optimizerDuck/Domain/Configuration/AppSettings.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Config;
+namespace optimizerDuck.Domain.Configuration;
/// <summary>
/// Application settings that can be persisted to disk.
diff --git a/optimizerDuck/Core/Models/Execution/ExecutionScope.cs b/optimizerDuck/Domain/Execution/ExecutionScope.cs
similarity index 98%
rename from optimizerDuck/Core/Models/Execution/ExecutionScope.cs
rename to optimizerDuck/Domain/Execution/ExecutionScope.cs
index b6960d1..16af572 100644
--- a/optimizerDuck/Core/Models/Execution/ExecutionScope.cs
+++ b/optimizerDuck/Domain/Execution/ExecutionScope.cs
@@ -1,12 +1,12 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
using System.Diagnostics;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-namespace optimizerDuck.Core.Models.Execution;
+namespace optimizerDuck.Domain.Execution;
public sealed class ExecutionScope : IDisposable
{
diff --git a/optimizerDuck/Core/Features/Desktop.cs b/optimizerDuck/Domain/Features/Categories/Desktop.cs
similarity index 93%
rename from optimizerDuck/Core/Features/Desktop.cs
rename to optimizerDuck/Domain/Features/Categories/Desktop.cs
index ba79993..1e84b4f 100644
--- a/optimizerDuck/Core/Features/Desktop.cs
+++ b/optimizerDuck/Domain/Features/Categories/Desktop.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Features;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Features.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Features;
+using optimizerDuck.UI.Pages.Features;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Features;
+namespace optimizerDuck.Domain.Features.Categories;
[FeatureCategory(PageType = typeof(DesktopFeatureCategory))]
public class Desktop : IFeatureCategory
diff --git a/optimizerDuck/Core/Features/Gaming.cs b/optimizerDuck/Domain/Features/Categories/Gaming.cs
similarity index 95%
rename from optimizerDuck/Core/Features/Gaming.cs
rename to optimizerDuck/Domain/Features/Categories/Gaming.cs
index 0887fed..f0abb09 100644
--- a/optimizerDuck/Core/Features/Gaming.cs
+++ b/optimizerDuck/Domain/Features/Categories/Gaming.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Features;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Features.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Features;
+using optimizerDuck.UI.Pages.Features;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Features;
+namespace optimizerDuck.Domain.Features.Categories;
[FeatureCategory(PageType = typeof(GamingFeatureCategory))]
public class Gaming : IFeatureCategory
diff --git a/optimizerDuck/Core/Features/Preferences.cs b/optimizerDuck/Domain/Features/Categories/Preferences.cs
similarity index 97%
rename from optimizerDuck/Core/Features/Preferences.cs
rename to optimizerDuck/Domain/Features/Categories/Preferences.cs
index b0e2e61..eb9a704 100644
--- a/optimizerDuck/Core/Features/Preferences.cs
+++ b/optimizerDuck/Domain/Features/Categories/Preferences.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Features;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Features.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Features;
+using optimizerDuck.UI.Pages.Features;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Features;
+namespace optimizerDuck.Domain.Features.Categories;
[FeatureCategory(PageType = typeof(PreferencesFeatureCategory))]
public class Preferences : IFeatureCategory
diff --git a/optimizerDuck/Core/Features/SystemFeatures.cs b/optimizerDuck/Domain/Features/Categories/SystemFeatures.cs
similarity index 80%
rename from optimizerDuck/Core/Features/SystemFeatures.cs
rename to optimizerDuck/Domain/Features/Categories/SystemFeatures.cs
index f4a2e64..e5ed98d 100644
--- a/optimizerDuck/Core/Features/SystemFeatures.cs
+++ b/optimizerDuck/Domain/Features/Categories/SystemFeatures.cs
@@ -1,14 +1,14 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Features;
-using optimizerDuck.Core.Models.Optimization.Services;
+using System.Collections.ObjectModel;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Features.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Services.Managers;
-using optimizerDuck.Core.Models.UI;
-using optimizerDuck.UI.Views.Pages.Features;
+using optimizerDuck.Domain.UI;
+using optimizerDuck.UI.Pages.Features;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Features;
+namespace optimizerDuck.Domain.Features.Categories;
[FeatureCategory(PageType = typeof(SystemFeatureCategory))]
public class SystemFeatures : IFeatureCategory
diff --git a/optimizerDuck/Core/Models/Features/BaseFeature.cs b/optimizerDuck/Domain/Features/Models/BaseFeature.cs
similarity index 93%
rename from optimizerDuck/Core/Models/Features/BaseFeature.cs
rename to optimizerDuck/Domain/Features/Models/BaseFeature.cs
index 27b1ffc..75651ac 100644
--- a/optimizerDuck/Core/Models/Features/BaseFeature.cs
+++ b/optimizerDuck/Domain/Features/Models/BaseFeature.cs
@@ -1,11 +1,11 @@
-using System.Reflection;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
+using System.Reflection;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.Features;
+namespace optimizerDuck.Domain.Features.Models;
public abstract class BaseFeature : IFeature
{
diff --git a/optimizerDuck/Core/Models/Features/FeatureSection.cs b/optimizerDuck/Domain/Features/Models/FeatureSection.cs
similarity index 76%
rename from optimizerDuck/Core/Models/Features/FeatureSection.cs
rename to optimizerDuck/Domain/Features/Models/FeatureSection.cs
index 192de23..84c4f43 100644
--- a/optimizerDuck/Core/Models/Features/FeatureSection.cs
+++ b/optimizerDuck/Domain/Features/Models/FeatureSection.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using optimizerDuck.UI.ViewModels.Features;
-namespace optimizerDuck.Core.Models.Features;
+namespace optimizerDuck.Domain.Features.Models;
public partial class FeatureSection : ObservableObject
{
diff --git a/optimizerDuck/Core/Models/Features/RegistryToggle.cs b/optimizerDuck/Domain/Features/Models/RegistryToggle.cs
similarity index 92%
rename from optimizerDuck/Core/Models/Features/RegistryToggle.cs
rename to optimizerDuck/Domain/Features/Models/RegistryToggle.cs
index a5db425..1d26cb8 100644
--- a/optimizerDuck/Core/Models/Features/RegistryToggle.cs
+++ b/optimizerDuck/Domain/Features/Models/RegistryToggle.cs
@@ -1,8 +1,8 @@
-using Microsoft.Win32;
-using optimizerDuck.Core.Models.Optimization.Services;
+using Microsoft.Win32;
+using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Services.OptimizationServices;
-namespace optimizerDuck.Core.Models.Features;
+namespace optimizerDuck.Domain.Features.Models;
public class RegistryToggle
{
diff --git a/optimizerDuck/Core/Optimizers/BloatwareAndServices.cs b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
similarity index 98%
rename from optimizerDuck/Core/Optimizers/BloatwareAndServices.cs
rename to optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
index 391486d..af6092f 100644
--- a/optimizerDuck/Core/Optimizers/BloatwareAndServices.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(BloatwareAndServicesOptimizerPage))]
public class BloatwareAndServices : IOptimizationCategory
diff --git a/optimizerDuck/Core/Optimizers/Gpu.cs b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
similarity index 96%
rename from optimizerDuck/Core/Optimizers/Gpu.cs
rename to optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
index 6bb8eef..cfbf515 100644
--- a/optimizerDuck/Core/Optimizers/Gpu.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
@@ -1,16 +1,16 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
public abstract class GpuRegistryOptimization : BaseOptimization
{
diff --git a/optimizerDuck/Core/Optimizers/Performance.cs b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
similarity index 95%
rename from optimizerDuck/Core/Optimizers/Performance.cs
rename to optimizerDuck/Domain/Optimizations/Categories/Performance.cs
index 70909d1..29ecb37 100644
--- a/optimizerDuck/Core/Optimizers/Performance.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
@@ -1,16 +1,16 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Extensions.Logging;
using Microsoft.Win32;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(PerformanceOptimizerPage))]
public class Performance : IOptimizationCategory
diff --git a/optimizerDuck/Core/Optimizers/PowerManagement.cs b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
similarity index 96%
rename from optimizerDuck/Core/Optimizers/PowerManagement.cs
rename to optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
index d13fd86..68de048 100644
--- a/optimizerDuck/Core/Optimizers/PowerManagement.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
@@ -1,17 +1,17 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Text.RegularExpressions;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(PowerManagementOptimizerPage))]
public class PowerManagement : IOptimizationCategory
diff --git a/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
similarity index 98%
rename from optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs
rename to optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
index 5db40d7..8fdd1bc 100644
--- a/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(SecurityAndPrivacyOptimizerPage))]
public class SecurityAndPrivacy : IOptimizationCategory
diff --git a/optimizerDuck/Core/Optimizers/UserExperience.cs b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
similarity index 87%
rename from optimizerDuck/Core/Optimizers/UserExperience.cs
rename to optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
index c3d90f5..a5c3b25 100644
--- a/optimizerDuck/Core/Optimizers/UserExperience.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
@@ -1,15 +1,15 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(UserExperienceOptimizerPage))]
public class UserExperience : IOptimizationCategory
diff --git a/optimizerDuck/Core/Models/Optimization/ApplyResult.cs b/optimizerDuck/Domain/Optimizations/Models/ApplyResult.cs
similarity index 94%
rename from optimizerDuck/Core/Models/Optimization/ApplyResult.cs
rename to optimizerDuck/Domain/Optimizations/Models/ApplyResult.cs
index a9a04f3..9633d81 100644
--- a/optimizerDuck/Core/Models/Optimization/ApplyResult.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/ApplyResult.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Optimization;
+namespace optimizerDuck.Domain.Optimizations.Models;
/// <summary>
/// Represents the result of applying a single optimization step.
diff --git a/optimizerDuck/Core/Models/Optimization/BaseOptimization.cs b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
similarity index 85%
rename from optimizerDuck/Core/Models/Optimization/BaseOptimization.cs
rename to optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
index c50f19f..ac89633 100644
--- a/optimizerDuck/Core/Models/Optimization/BaseOptimization.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
@@ -1,13 +1,13 @@
-using System.Reflection;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.UI;
+using System.Reflection;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Managers;
using Wpf.Ui.Controls;
-using OptimizationState = optimizerDuck.Core.Models.UI.OptimizationState;
+using OptimizationState = optimizerDuck.Domain.UI.OptimizationState;
-namespace optimizerDuck.Core.Models.Optimization;
+namespace optimizerDuck.Domain.Optimizations.Models;
public abstract class BaseOptimization : IOptimization
{
@@ -72,14 +72,14 @@ public abstract class BaseOptimization : IOptimization
/*
using Microsoft.Extensions.Logging;
using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Managers;
-using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimizations;
-namespace optimizerDuck.Core.Optimizers;
+namespace optimizerDuck.Domain.Optimizations.Categories;
[OptimizationCategory(typeof(PAGE))]
public class OPTIMIZER : IOptimizationCategory
diff --git a/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs b/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs
similarity index 94%
rename from optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs
rename to optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs
index 8f8c2c4..bc36634 100644
--- a/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Bloatware/AppXPackage.cs
@@ -1,9 +1,9 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using optimizerDuck.Core.Models.UI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.Optimization.Bloatware;
+namespace optimizerDuck.Domain.Optimizations.Models.Bloatware;
/// <summary>
/// Specifies the risk level of removing a bloatware app.
diff --git a/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs
similarity index 95%
rename from optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs
rename to optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs
index 767877f..2e3c30a 100644
--- a/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Cleanup/CleanupItem.cs
@@ -1,7 +1,7 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.Optimization.Cleanup;
+namespace optimizerDuck.Domain.Optimizations.Models.Cleanup;
/// <summary>
/// Represents a disk cleanup item (e.g., temp files, Windows Update cache).
diff --git a/optimizerDuck/Core/Models/Optimization/OperationStepResult.cs b/optimizerDuck/Domain/Optimizations/Models/OperationStepResult.cs
similarity index 92%
rename from optimizerDuck/Core/Models/Optimization/OperationStepResult.cs
rename to optimizerDuck/Domain/Optimizations/Models/OperationStepResult.cs
index e117ef9..85479a9 100644
--- a/optimizerDuck/Core/Models/Optimization/OperationStepResult.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/OperationStepResult.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Domain.Abstractions;
-namespace optimizerDuck.Core.Models.Optimization;
+namespace optimizerDuck.Domain.Optimizations.Models;
/// <summary>
/// Represents the result of a single operation step within an optimization.
diff --git a/optimizerDuck/Core/Models/Optimization/OptimizationContext.cs b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
similarity index 88%
rename from optimizerDuck/Core/Models/Optimization/OptimizationContext.cs
rename to optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
index 9b318f2..791f162 100644
--- a/optimizerDuck/Core/Models/Optimization/OptimizationContext.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
@@ -1,7 +1,7 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
using optimizerDuck.Services;
-namespace optimizerDuck.Core.Models.Optimization;
+namespace optimizerDuck.Domain.Optimizations.Models;
/// <summary>
/// Provides context information for optimization execution.
diff --git a/optimizerDuck/Core/Models/Optimization/OptimizationResult.cs b/optimizerDuck/Domain/Optimizations/Models/OptimizationResult.cs
similarity index 89%
rename from optimizerDuck/Core/Models/Optimization/OptimizationResult.cs
rename to optimizerDuck/Domain/Optimizations/Models/OptimizationResult.cs
index 4bd6b38..d750db5 100644
--- a/optimizerDuck/Core/Models/Optimization/OptimizationResult.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/OptimizationResult.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.UI;
-namespace optimizerDuck.Core.Models.Optimization;
+namespace optimizerDuck.Domain.Optimizations.Models;
/// <summary>
/// Represents the result of an optimization apply operation.
diff --git a/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
similarity index 97%
rename from optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs
rename to optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
index f777cef..8e76eac 100644
--- a/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/ScheduledTask/ScheduledTaskModel.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
-namespace optimizerDuck.Core.Models.Optimization.ScheduledTask;
+namespace optimizerDuck.Domain.Optimizations.Models.ScheduledTask;
/// <summary>
/// Represents a Windows Scheduled Task.
diff --git a/optimizerDuck/Core/Models/Optimization/Services/RegistryItem.cs b/optimizerDuck/Domain/Optimizations/Models/Services/RegistryItem.cs
similarity index 97%
rename from optimizerDuck/Core/Models/Optimization/Services/RegistryItem.cs
rename to optimizerDuck/Domain/Optimizations/Models/Services/RegistryItem.cs
index 5d921a8..ba2be5c 100644
--- a/optimizerDuck/Core/Models/Optimization/Services/RegistryItem.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Services/RegistryItem.cs
@@ -1,6 +1,6 @@
-using Microsoft.Win32;
+using Microsoft.Win32;
-namespace optimizerDuck.Core.Models.Optimization.Services;
+namespace optimizerDuck.Domain.Optimizations.Models.Services;
/// <summary>
/// Represents a single registry value or key to be read, written, or deleted.
diff --git a/optimizerDuck/Core/Models/Optimization/Services/ServiceItem.cs b/optimizerDuck/Domain/Optimizations/Models/Services/ServiceItem.cs
similarity index 89%
rename from optimizerDuck/Core/Models/Optimization/Services/ServiceItem.cs
rename to optimizerDuck/Domain/Optimizations/Models/Services/ServiceItem.cs
index a173fbf..1b78214 100644
--- a/optimizerDuck/Core/Models/Optimization/Services/ServiceItem.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Services/ServiceItem.cs
@@ -1,6 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
-namespace optimizerDuck.Core.Models.Optimization.Services;
+namespace optimizerDuck.Domain.Optimizations.Models.Services;
/// <summary>
/// Represents a Windows service to be configured with a specific startup type.
diff --git a/optimizerDuck/Core/Models/Optimization/Services/ServiceStartupType.cs b/optimizerDuck/Domain/Optimizations/Models/Services/ServiceStartupType.cs
similarity index 89%
rename from optimizerDuck/Core/Models/Optimization/Services/ServiceStartupType.cs
rename to optimizerDuck/Domain/Optimizations/Models/Services/ServiceStartupType.cs
index fe169b6..23d008b 100644
--- a/optimizerDuck/Core/Models/Optimization/Services/ServiceStartupType.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Services/ServiceStartupType.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Optimization.Services;
+namespace optimizerDuck.Domain.Optimizations.Models.Services;
/// <summary>
/// Specifies the startup type for a Windows service.
diff --git a/optimizerDuck/Core/Models/Optimization/Services/ShellResult.cs b/optimizerDuck/Domain/Optimizations/Models/Services/ShellResult.cs
similarity index 93%
rename from optimizerDuck/Core/Models/Optimization/Services/ShellResult.cs
rename to optimizerDuck/Domain/Optimizations/Models/Services/ShellResult.cs
index a7bbe74..b262107 100644
--- a/optimizerDuck/Core/Models/Optimization/Services/ShellResult.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Services/ShellResult.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.Optimization.Services;
+namespace optimizerDuck.Domain.Optimizations.Models.Services;
/// <summary>
/// Represents the result of a shell command execution.
diff --git a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs
similarity index 96%
rename from optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs
rename to optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs
index 531faa9..25059c6 100644
--- a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupApp.cs
@@ -1,8 +1,8 @@
-using System.IO;
+using System.IO;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
-namespace optimizerDuck.Core.Models.Optimization.StartupManager;
+namespace optimizerDuck.Domain.Optimizations.Models.StartupManager;
/// <summary>
/// Specifies the location of a startup application.
diff --git a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
similarity index 93%
rename from optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs
rename to optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
index 3c16e28..1d651df 100644
--- a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/StartupManager/StartupTask.cs
@@ -1,7 +1,7 @@
-using System.Windows.Media;
+using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
-namespace optimizerDuck.Core.Models.Optimization.StartupManager;
+namespace optimizerDuck.Domain.Optimizations.Models.StartupManager;
/// <summary>
/// Represents a scheduled task that runs at startup.
diff --git a/optimizerDuck/Core/Models/Revert/RevertData.cs b/optimizerDuck/Domain/Revert/RevertData.cs
similarity index 93%
rename from optimizerDuck/Core/Models/Revert/RevertData.cs
rename to optimizerDuck/Domain/Revert/RevertData.cs
index 4f72d06..dfb3f5a 100644
--- a/optimizerDuck/Core/Models/Revert/RevertData.cs
+++ b/optimizerDuck/Domain/Revert/RevertData.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-namespace optimizerDuck.Core.Models.Revert;
+namespace optimizerDuck.Domain.Revert;
/// <summary>
/// Represents a single revert step stored in JSON.
diff --git a/optimizerDuck/Core/Models/Revert/RevertResult.cs b/optimizerDuck/Domain/Revert/RevertResult.cs
similarity index 90%
rename from optimizerDuck/Core/Models/Revert/RevertResult.cs
rename to optimizerDuck/Domain/Revert/RevertResult.cs
index 80cc506..9d5f3f0 100644
--- a/optimizerDuck/Core/Models/Revert/RevertResult.cs
+++ b/optimizerDuck/Domain/Revert/RevertResult.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.Core.Models.Optimization;
+using optimizerDuck.Domain.Optimizations.Models;
-namespace optimizerDuck.Core.Models.Revert;
+namespace optimizerDuck.Domain.Revert;
/// <summary>
/// Represents the result of a revert operation.
diff --git a/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
similarity index 98%
rename from optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs
rename to optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
index aca9b02..be4d6c0 100644
--- a/optimizerDuck/Core/Models/Revert/Steps/RegistryRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
@@ -1,11 +1,11 @@
-using Microsoft.Win32;
+using Microsoft.Win32;
using Newtonsoft.Json.Linq;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization.Services;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
-namespace optimizerDuck.Core.Models.Revert.Steps;
+namespace optimizerDuck.Domain.Revert.Steps;
/// <summary>
/// Represents a revert step that restores or deletes a registry value.
diff --git a/optimizerDuck/Core/Models/Revert/Steps/ScheduledTaskRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
similarity index 94%
rename from optimizerDuck/Core/Models/Revert/Steps/ScheduledTaskRevertStep.cs
rename to optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
index c8d82f0..4086e52 100644
--- a/optimizerDuck/Core/Models/Revert/Steps/ScheduledTaskRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
@@ -1,9 +1,9 @@
-using Newtonsoft.Json.Linq;
-using optimizerDuck.Core.Interfaces;
+using Newtonsoft.Json.Linq;
+using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
-namespace optimizerDuck.Core.Models.Revert.Steps;
+namespace optimizerDuck.Domain.Revert.Steps;
/// <summary>
/// Represents a revert step that restores a scheduled task to its original enabled/disabled state.
diff --git a/optimizerDuck/Core/Models/Revert/Steps/ServiceRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
similarity index 92%
rename from optimizerDuck/Core/Models/Revert/Steps/ServiceRevertStep.cs
rename to optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
index 19339f5..8678ad1 100644
--- a/optimizerDuck/Core/Models/Revert/Steps/ServiceRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
@@ -1,10 +1,10 @@
-using Newtonsoft.Json.Linq;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization.Services;
+using Newtonsoft.Json.Linq;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
-namespace optimizerDuck.Core.Models.Revert.Steps;
+namespace optimizerDuck.Domain.Revert.Steps;
/// <summary>
/// Represents a revert step that restores a Windows service to its original startup type.
diff --git a/optimizerDuck/Core/Models/Revert/Steps/ShellRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
similarity index 93%
rename from optimizerDuck/Core/Models/Revert/Steps/ShellRevertStep.cs
rename to optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
index f031acc..4cc9bf4 100644
--- a/optimizerDuck/Core/Models/Revert/Steps/ShellRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
@@ -1,10 +1,10 @@
-using Newtonsoft.Json.Linq;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization.Services;
+using Newtonsoft.Json.Linq;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
-namespace optimizerDuck.Core.Models.Revert.Steps;
+namespace optimizerDuck.Domain.Revert.Steps;
/// <summary>
/// Represents a revert step that re-executes a shell command to undo changes.
diff --git a/optimizerDuck/Core/Models/UI/FeatureCategoryOrder.cs b/optimizerDuck/Domain/UI/FeatureCategoryOrder.cs
similarity index 69%
rename from optimizerDuck/Core/Models/UI/FeatureCategoryOrder.cs
rename to optimizerDuck/Domain/UI/FeatureCategoryOrder.cs
index 5b4a3cb..df66b9d 100644
--- a/optimizerDuck/Core/Models/UI/FeatureCategoryOrder.cs
+++ b/optimizerDuck/Domain/UI/FeatureCategoryOrder.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
public enum FeatureCategoryOrder
{
diff --git a/optimizerDuck/Core/Models/UI/LanguageOption.cs b/optimizerDuck/Domain/UI/LanguageOption.cs
similarity index 87%
rename from optimizerDuck/Core/Models/UI/LanguageOption.cs
rename to optimizerDuck/Domain/UI/LanguageOption.cs
index 90e2064..8b9cca4 100644
--- a/optimizerDuck/Core/Models/UI/LanguageOption.cs
+++ b/optimizerDuck/Domain/UI/LanguageOption.cs
@@ -1,6 +1,6 @@
-using System.Globalization;
+using System.Globalization;
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Represents a selectable language option in the settings UI.
diff --git a/optimizerDuck/Core/Models/UI/OptimizationCategoryOrder.cs b/optimizerDuck/Domain/UI/OptimizationCategoryOrder.cs
similarity index 93%
rename from optimizerDuck/Core/Models/UI/OptimizationCategoryOrder.cs
rename to optimizerDuck/Domain/UI/OptimizationCategoryOrder.cs
index 6d89265..5be6bb6 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationCategoryOrder.cs
+++ b/optimizerDuck/Domain/UI/OptimizationCategoryOrder.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Specifies the display order of optimization categories in the UI.
diff --git a/optimizerDuck/Core/Models/UI/OptimizationRisk.cs b/optimizerDuck/Domain/UI/OptimizationRisk.cs
similarity index 91%
rename from optimizerDuck/Core/Models/UI/OptimizationRisk.cs
rename to optimizerDuck/Domain/UI/OptimizationRisk.cs
index 1d52449..b586a75 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationRisk.cs
+++ b/optimizerDuck/Domain/UI/OptimizationRisk.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Specifies the risk level associated with an optimization.
diff --git a/optimizerDuck/Core/Models/UI/OptimizationState.cs b/optimizerDuck/Domain/UI/OptimizationState.cs
similarity index 98%
rename from optimizerDuck/Core/Models/UI/OptimizationState.cs
rename to optimizerDuck/Domain/UI/OptimizationState.cs
index 6735662..2f3c093 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationState.cs
+++ b/optimizerDuck/Domain/UI/OptimizationState.cs
@@ -3,7 +3,7 @@ using System.Windows.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
using optimizerDuck.Resources.Languages;
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Tracks the applied state and timing of an optimization.
diff --git a/optimizerDuck/Core/Models/UI/OptimizationSuccessResult.cs b/optimizerDuck/Domain/UI/OptimizationSuccessResult.cs
similarity index 90%
rename from optimizerDuck/Core/Models/UI/OptimizationSuccessResult.cs
rename to optimizerDuck/Domain/UI/OptimizationSuccessResult.cs
index 5fac3b1..88b3783 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationSuccessResult.cs
+++ b/optimizerDuck/Domain/UI/OptimizationSuccessResult.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Indicates the result status of an optimization apply or revert operation.
diff --git a/optimizerDuck/Core/Models/UI/OptimizationTags.cs b/optimizerDuck/Domain/UI/OptimizationTags.cs
similarity index 98%
rename from optimizerDuck/Core/Models/UI/OptimizationTags.cs
rename to optimizerDuck/Domain/UI/OptimizationTags.cs
index 9906183..65452a9 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationTags.cs
+++ b/optimizerDuck/Domain/UI/OptimizationTags.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.Resources.Languages;
+using optimizerDuck.Resources.Languages;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Flags that categorize an optimization by the system areas it affects.
diff --git a/optimizerDuck/Core/Models/UI/ProcessingProgress.cs b/optimizerDuck/Domain/UI/ProcessingProgress.cs
similarity index 94%
rename from optimizerDuck/Core/Models/UI/ProcessingProgress.cs
rename to optimizerDuck/Domain/UI/ProcessingProgress.cs
index e7e702d..b01d094 100644
--- a/optimizerDuck/Core/Models/UI/ProcessingProgress.cs
+++ b/optimizerDuck/Domain/UI/ProcessingProgress.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Represents the progress of a long-running operation (e.g., optimization, cleanup).
diff --git a/optimizerDuck/Core/Models/UI/RiskVisual.cs b/optimizerDuck/Domain/UI/RiskVisual.cs
similarity index 86%
rename from optimizerDuck/Core/Models/UI/RiskVisual.cs
rename to optimizerDuck/Domain/UI/RiskVisual.cs
index e9e6e27..2ee6e14 100644
--- a/optimizerDuck/Core/Models/UI/RiskVisual.cs
+++ b/optimizerDuck/Domain/UI/RiskVisual.cs
@@ -1,6 +1,6 @@
-using Wpf.Ui.Controls;
+using Wpf.Ui.Controls;
-namespace optimizerDuck.Core.Models.UI;
+namespace optimizerDuck.Domain.UI;
/// <summary>
/// Represents the visual display data for a risk level in the UI.
diff --git a/optimizerDuck/Services/Managers/ConfigManager.cs b/optimizerDuck/Services/Configuration/ConfigManager.cs
similarity index 99%
rename from optimizerDuck/Services/Managers/ConfigManager.cs
rename to optimizerDuck/Services/Configuration/ConfigManager.cs
index 7ba69e3..b0391e4 100644
--- a/optimizerDuck/Services/Managers/ConfigManager.cs
+++ b/optimizerDuck/Services/Configuration/ConfigManager.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
diff --git a/optimizerDuck/Services/Managers/LanguageManager.cs b/optimizerDuck/Services/Configuration/LanguageManager.cs
similarity index 100%
rename from optimizerDuck/Services/Managers/LanguageManager.cs
rename to optimizerDuck/Services/Configuration/LanguageManager.cs
diff --git a/optimizerDuck/Services/BloatwareService.cs b/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
similarity index 98%
rename from optimizerDuck/Services/BloatwareService.cs
rename to optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
index a636d95..60e6517 100644
--- a/optimizerDuck/Services/BloatwareService.cs
+++ b/optimizerDuck/Services/Features/Bloatware/BloatwareService.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
@@ -6,10 +6,10 @@ using System.Xml.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Models.Config;
-using optimizerDuck.Core.Models.Execution;
+using optimizerDuck.Domain.Configuration;
+using optimizerDuck.Domain.Execution;
using optimizerDuck.Services.OptimizationServices;
-using AppXPackage = optimizerDuck.Core.Models.Optimization.Bloatware.AppXPackage;
+using AppXPackage = optimizerDuck.Domain.Optimizations.Models.Bloatware.AppXPackage;
using JsonSerializer = System.Text.Json.JsonSerializer;
namespace optimizerDuck.Services;
diff --git a/optimizerDuck/Services/DiskCleanupService.cs b/optimizerDuck/Services/Features/DiskCleanup/DiskCleanupService.cs
similarity index 99%
rename from optimizerDuck/Services/DiskCleanupService.cs
rename to optimizerDuck/Services/Features/DiskCleanup/DiskCleanupService.cs
index cf86746..2de5b57 100644
--- a/optimizerDuck/Services/DiskCleanupService.cs
+++ b/optimizerDuck/Services/Features/DiskCleanup/DiskCleanupService.cs
@@ -1,9 +1,9 @@
-using System.IO;
+using System.IO;
using Microsoft.Extensions.Logging;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
using Wpf.Ui.Controls;
-using CleanupItem = optimizerDuck.Core.Models.Optimization.Cleanup.CleanupItem;
+using CleanupItem = optimizerDuck.Domain.Optimizations.Models.Cleanup.CleanupItem;
namespace optimizerDuck.Services;
diff --git a/optimizerDuck/Services/FeatureRegistry.cs b/optimizerDuck/Services/Features/FeatureRegistry.cs
similarity index 92%
rename from optimizerDuck/Services/FeatureRegistry.cs
rename to optimizerDuck/Services/Features/FeatureRegistry.cs
index 9151048..8683d9c 100644
--- a/optimizerDuck/Services/FeatureRegistry.cs
+++ b/optimizerDuck/Services/Features/FeatureRegistry.cs
@@ -1,9 +1,9 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Reflection;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.Features;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Attributes;
+using optimizerDuck.Domain.Features.Models;
using Wpf.Ui.Controls;
namespace optimizerDuck.Services;
diff --git a/optimizerDuck/Services/StartupManagerService.cs b/optimizerDuck/Services/Features/StartupManager/StartupManagerService.cs
similarity index 98%
rename from optimizerDuck/Services/StartupManagerService.cs
rename to optimizerDuck/Services/Features/StartupManager/StartupManagerService.cs
index 35c7a38..f8615a5 100644
--- a/optimizerDuck/Services/StartupManagerService.cs
+++ b/optimizerDuck/Services/Features/StartupManager/StartupManagerService.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Windows;
@@ -6,10 +6,10 @@ using System.Windows.Interop;
using System.Windows.Media.Imaging;
using Microsoft.Extensions.Logging;
using Microsoft.Win32;
-using optimizerDuck.Core.Models.Optimization.StartupManager;
+using optimizerDuck.Domain.Optimizations.Models.StartupManager;
using optimizerDuck.Services.OptimizationServices;
-using StartupApp = optimizerDuck.Core.Models.Optimization.StartupManager.StartupApp;
-using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;
+using StartupApp = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupApp;
+using StartupTask = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupTask;
namespace optimizerDuck.Services;
diff --git a/optimizerDuck/Services/OptimizationRegistry.cs b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs
similarity index 96%
rename from optimizerDuck/Services/OptimizationRegistry.cs
rename to optimizerDuck/Services/Optimization/OptimizationRegistry.cs
index f46fd02..5e7d8f8 100644
--- a/optimizerDuck/Services/OptimizationRegistry.cs
+++ b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs
@@ -2,8 +2,8 @@
using System.Reflection;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models;
namespace optimizerDuck.Services;
diff --git a/optimizerDuck/Services/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.cs
similarity index 97%
rename from optimizerDuck/Services/OptimizationService.cs
rename to optimizerDuck/Services/Optimization/OptimizationService.cs
index d96b4a8..1276e9b 100644
--- a/optimizerDuck/Services/OptimizationService.cs
+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs
@@ -1,17 +1,17 @@
-using System.IO;
+using System.IO;
using System.Text.RegularExpressions;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Revert;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Revert;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
using optimizerDuck.UI.ViewModels.Dialogs;
-using optimizerDuck.UI.Views.Dialogs;
+using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/Services/OptimizationServices/RegistryService.cs b/optimizerDuck/Services/Optimization/Providers/RegistryService.cs
similarity index 99%
rename from optimizerDuck/Services/OptimizationServices/RegistryService.cs
rename to optimizerDuck/Services/Optimization/Providers/RegistryService.cs
index 530e97f..a3e8d5a 100644
--- a/optimizerDuck/Services/OptimizationServices/RegistryService.cs
+++ b/optimizerDuck/Services/Optimization/Providers/RegistryService.cs
@@ -1,11 +1,11 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
using System.Security;
using Microsoft.Win32;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.Revert.Steps;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Managers;
diff --git a/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
similarity index 98%
rename from optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs
rename to optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
index c5250be..5eb7744 100644
--- a/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs
+++ b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
@@ -1,9 +1,9 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using Microsoft.Win32.TaskScheduler;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Revert.Steps;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Resources.Languages;
-using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;
+using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
using Task = Microsoft.Win32.TaskScheduler.Task;
namespace optimizerDuck.Services.OptimizationServices;
diff --git a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs b/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs
similarity index 96%
rename from optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs
rename to optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs
index f377a6a..cf40298 100644
--- a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs
+++ b/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs
@@ -1,9 +1,9 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.Management;
using optimizerDuck.Common.Extensions;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.Revert.Steps;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Resources.Languages;
namespace optimizerDuck.Services.OptimizationServices;
diff --git a/optimizerDuck/Services/OptimizationServices/ShellService.cs b/optimizerDuck/Services/Optimization/Providers/ShellService.cs
similarity index 98%
rename from optimizerDuck/Services/OptimizationServices/ShellService.cs
rename to optimizerDuck/Services/Optimization/Providers/ShellService.cs
index 857a98f..99c7b98 100644
--- a/optimizerDuck/Services/OptimizationServices/ShellService.cs
+++ b/optimizerDuck/Services/Optimization/Providers/ShellService.cs
@@ -1,11 +1,11 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.Text;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Extensions;
-using optimizerDuck.Core.Models.Config;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization.Services;
-using optimizerDuck.Core.Models.Revert.Steps;
+using optimizerDuck.Domain.Configuration;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Services;
+using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Resources.Languages;
namespace optimizerDuck.Services.OptimizationServices;
diff --git a/optimizerDuck/Services/Managers/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.cs
similarity index 96%
rename from optimizerDuck/Services/Managers/RevertManager.cs
rename to optimizerDuck/Services/Revert/RevertManager.cs
index 7300c97..313cac2 100644
--- a/optimizerDuck/Services/Managers/RevertManager.cs
+++ b/optimizerDuck/Services/Revert/RevertManager.cs
@@ -1,15 +1,15 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
using System.IO;
using System.Reflection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Execution;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.Revert;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.Revert;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
namespace optimizerDuck.Services.Managers;
diff --git a/optimizerDuck/Services/StreamService.cs b/optimizerDuck/Services/System/StreamService.cs
similarity index 98%
rename from optimizerDuck/Services/StreamService.cs
rename to optimizerDuck/Services/System/StreamService.cs
index 391dc29..24f06cc 100644
--- a/optimizerDuck/Services/StreamService.cs
+++ b/optimizerDuck/Services/System/StreamService.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
using System.Net.Http;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
diff --git a/optimizerDuck/Services/SystemInfoService.cs b/optimizerDuck/Services/System/SystemInfoService.cs
similarity index 100%
rename from optimizerDuck/Services/SystemInfoService.cs
rename to optimizerDuck/Services/System/SystemInfoService.cs
diff --git a/optimizerDuck/Services/UpdaterService.cs b/optimizerDuck/Services/System/UpdaterService.cs
similarity index 99%
rename from optimizerDuck/Services/UpdaterService.cs
rename to optimizerDuck/Services/System/UpdaterService.cs
index 133d2ad..966a709 100644
--- a/optimizerDuck/Services/UpdaterService.cs
+++ b/optimizerDuck/Services/System/UpdaterService.cs
@@ -1,4 +1,4 @@
-using System.Net.Http;
+using System.Net.Http;
using System.Net.Http.Headers;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
diff --git a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml
rename to optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index cb4b342..027c1b1 100644
--- a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -3,7 +3,7 @@
d:DesignHeight="700"
d:DesignWidth="600"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.OptimizationDetailsDialog"
+ x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml.cs b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml.cs
similarity index 86%
rename from optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml.cs
index 174782d..427286b 100644
--- a/optimizerDuck/UI/Views/Dialogs/OptimizationDetailsDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml.cs
@@ -1,6 +1,6 @@
using System.Windows.Controls;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
/// <summary>
/// Interaction logic for OptimizationMoreInfoDialog.xaml
diff --git a/optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
similarity index 98%
rename from optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml
rename to optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
index 2d23352..04ea6f6 100644
--- a/optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
@@ -1,8 +1,8 @@
-<UserControl
+<UserControl
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.OptimizationResultDialog"
+ x:Class="optimizerDuck.UI.Dialogs.OptimizationResultDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml.cs b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml.cs
similarity index 75%
rename from optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml.cs
index e08b59d..c168512 100644
--- a/optimizerDuck/UI/Views/Dialogs/OptimizationResultDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
public partial class OptimizationResultDialog
{
diff --git a/optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
similarity index 93%
rename from optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml
rename to optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
index 528088f..98cc3db 100644
--- a/optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
@@ -2,7 +2,7 @@
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.ProcessingDialog"
+ x:Class="optimizerDuck.UI.Dialogs.ProcessingDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml.cs b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml.cs
similarity index 89%
rename from optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/ProcessingDialog.xaml.cs
index 768c101..630faf8 100644
--- a/optimizerDuck/UI/Views/Dialogs/ProcessingDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml.cs
@@ -1,7 +1,7 @@
using System.Windows.Controls;
using optimizerDuck.UI.ViewModels.Dialogs;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
/// <summary>
/// Interaction logic for ProcessingOptimizationDialog.xaml
diff --git a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
similarity index 92%
rename from optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml
rename to optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
index 2a1b543..5128e6a 100644
--- a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml
@@ -1,8 +1,8 @@
-<UserControl
+<UserControl
d:DesignHeight="300"
d:DesignWidth="300"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.RestorePointDialog"
+ x:Class="optimizerDuck.UI.Dialogs.RestorePointDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml.cs b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml.cs
similarity index 64%
rename from optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/RestorePointDialog.xaml.cs
index afe1ab1..23ee38e 100644
--- a/optimizerDuck/UI/Views/Dialogs/RestorePointDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml.cs
@@ -1,6 +1,6 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
public partial class RestorePointDialog : UserControl
{
diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
similarity index 98%
rename from optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml
rename to optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
index 12bdd36..b2efeb4 100644
--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml
@@ -1,8 +1,8 @@
-<UserControl
+<UserControl
d:DesignHeight="400"
d:DesignWidth="500"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.ScheduledTaskCreateDialog"
+ x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskCreateDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml.cs
similarity index 91%
rename from optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml.cs
index e376b65..84e809b 100644
--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml.cs
@@ -1,7 +1,7 @@
-using System.Windows.Controls;
-using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;
+using System.Windows.Controls;
+using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
public partial class ScheduledTaskCreateDialog : UserControl
{
diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml
rename to optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
index d217125..f252ab0 100644
--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml
@@ -1,8 +1,8 @@
-<UserControl
+<UserControl
d:DesignHeight="400"
d:DesignWidth="500"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.ScheduledTaskDetailsDialog"
+ x:Class="optimizerDuck.UI.Dialogs.ScheduledTaskDetailsDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
similarity index 89%
rename from optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
rename to optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
index 5702c00..a3222c8 100644
--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml.cs
@@ -1,8 +1,8 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
using System.Windows.Media;
-using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;
+using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
public partial class ScheduledTaskDetailsDialog : UserControl
{
diff --git a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
similarity index 98%
rename from optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml
rename to optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
index 4e2f9bd..ad10d55 100644
--- a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml
@@ -1,8 +1,8 @@
-<UserControl
+<UserControl
d:DesignHeight="200"
d:DesignWidth="400"
mc:Ignorable="d"
- x:Class="optimizerDuck.UI.Views.Dialogs.StartupTaskDetailsPanel"
+ x:Class="optimizerDuck.UI.Dialogs.StartupTaskDetailsPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
diff --git a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
similarity index 71%
rename from optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs
rename to optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
index 0dd216e..53cc285 100644
--- a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs
+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml.cs
@@ -1,7 +1,7 @@
-using System.Windows.Controls;
-using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;
+using System.Windows.Controls;
+using StartupTask = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupTask;
-namespace optimizerDuck.UI.Views.Dialogs;
+namespace optimizerDuck.UI.Dialogs;
public partial class StartupTaskDetailsPanel : UserControl
{
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
rename to optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml
index 3fd1692..c2116d2 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,13 +9,13 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.BloatwarePage"
+ x:Class="optimizerDuck.UI.Pages.BloatwarePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:bloatware1="clr-namespace:optimizerDuck.Core.Models.Optimization.Bloatware"
+ xmlns:bloatware1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Bloatware"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml.cs b/optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml.cs
similarity index 79%
rename from optimizerDuck/UI/Views/Pages/BloatwarePage.xaml.cs
rename to optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml.cs
index b72fb77..66a2ef7 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Bloatware/BloatwarePage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class BloatwarePage : INavigableView<BloatwareViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/DashboardPage.xaml
rename to optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml
index 119b04e..89eef83 100644
--- a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,13 +9,13 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.DashboardPage"
+ x:Class="optimizerDuck.UI.Pages.DashboardPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml.cs b/optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml.cs
similarity index 79%
rename from optimizerDuck/UI/Views/Pages/DashboardPage.xaml.cs
rename to optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml.cs
index 01ad799..72de150 100644
--- a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Dashboard/DashboardPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class DashboardPage : INavigableView<DashboardViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
rename to optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml
index fc043ab..aed16b0 100644
--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
+++ b/optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,13 +9,13 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.DiskCleanupPage"
+ x:Class="optimizerDuck.UI.Pages.DiskCleanupPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:cleanup1="clr-namespace:optimizerDuck.Core.Models.Optimization.Cleanup"
+ xmlns:cleanup1="clr-namespace:optimizerDuck.Domain.Optimizations.Models.Cleanup"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml.cs b/optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml.cs
similarity index 80%
rename from optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml.cs
rename to optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml.cs
index ab1b4e7..7a98ffc 100644
--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/DiskCleanup/DiskCleanupPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class DiskCleanupPage : INavigableView<DiskCleanupViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
similarity index 98%
rename from optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml
rename to optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
index 7cf3e86..e84d8a0 100644
--- a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,12 +9,12 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.Features.FeatureCategoryPage"
+ x:Class="optimizerDuck.UI.Pages.Features.FeatureCategoryPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:features="clr-namespace:optimizerDuck.UI.Views.Pages.Features"
+ xmlns:features="clr-namespace:optimizerDuck.UI.Pages.Features"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.cs b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml.cs
similarity index 79%
rename from optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.cs
rename to optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml.cs
index 2c5bd78..3f430dd 100644
--- a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages.Features;
+namespace optimizerDuck.UI.Pages.Features;
public partial class FeatureCategoryPage : INavigableView<FeatureCategoryViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.cs b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPages.cs
similarity index 89%
rename from optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.cs
rename to optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPages.cs
index 5d82e84..959ae8a 100644
--- a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.cs
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPages.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
-namespace optimizerDuck.UI.Views.Pages.Features;
+namespace optimizerDuck.UI.Pages.Features;
public sealed class PreferencesFeatureCategory : FeatureCategoryPage
{
diff --git a/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
similarity index 97%
rename from optimizerDuck/UI/Views/Pages/FeaturesPage.xaml
rename to optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
index c193449..063a6da 100644
--- a/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,13 +9,13 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.FeaturesPage"
+ x:Class="optimizerDuck.UI.Pages.FeaturesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.cs b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml.cs
similarity index 82%
rename from optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.cs
rename to optimizerDuck/UI/Pages/Features/FeaturesPage.xaml.cs
index c7f25f1..9ed3272 100644
--- a/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class FeaturesPage : INavigableView<FeaturesViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
similarity index 98%
rename from optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
rename to optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index 0fb7f19..6e16c73 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,14 +9,14 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.Optimizations.OptimizationPage"
+ x:Class="optimizerDuck.UI.Pages.Optimizations.OptimizationPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:optimization="clr-namespace:optimizerDuck.Core.Models.Optimization"
- xmlns:optimizations="clr-namespace:optimizerDuck.UI.Views.Pages.Optimizations"
+ xmlns:optimization="clr-namespace:optimizerDuck.Domain.Optimizations.Models"
+ xmlns:optimizations="clr-namespace:optimizerDuck.UI.Pages.Optimizations"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml.cs b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml.cs
similarity index 78%
rename from optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml.cs
rename to optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml.cs
index a73de2c..257ecd1 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Optimizer;
+using optimizerDuck.UI.ViewModels.Optimizer;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages.Optimizations;
+namespace optimizerDuck.UI.Pages.Optimizations;
public partial class OptimizationPage : INavigableView<OptimizationCategoryViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPages.cs b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
similarity index 92%
rename from optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPages.cs
rename to optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
index cd40b74..4ef933d 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPages.cs
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
@@ -1,6 +1,6 @@
-using optimizerDuck.UI.ViewModels.Optimizer;
+using optimizerDuck.UI.ViewModels.Optimizer;
-namespace optimizerDuck.UI.Views.Pages.Optimizations;
+namespace optimizerDuck.UI.Pages.Optimizations;
public sealed class PowerManagementOptimizerPage : OptimizationPage
{
diff --git a/optimizerDuck/UI/Views/Pages/OptimizePage.xaml b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
similarity index 89%
rename from optimizerDuck/UI/Views/Pages/OptimizePage.xaml
rename to optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
index 016dcdb..2207817 100644
--- a/optimizerDuck/UI/Views/Pages/OptimizePage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,11 +9,11 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.OptimizePage"
+ x:Class="optimizerDuck.UI.Pages.OptimizePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Grid>
diff --git a/optimizerDuck/UI/Views/Pages/OptimizePage.xaml.cs b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml.cs
similarity index 92%
rename from optimizerDuck/UI/Views/Pages/OptimizePage.xaml.cs
rename to optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml.cs
index b7bcf72..36b8aeb 100644
--- a/optimizerDuck/UI/Views/Pages/OptimizePage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml.cs
@@ -1,9 +1,9 @@
-using System.Windows.Threading;
+using System.Windows.Threading;
using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class OptimizePage : INavigableView<OptimizeViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml
rename to optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml
index e9fd438..782965a 100644
--- a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml
+++ b/optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,14 +9,14 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.ScheduledTasksPage"
+ x:Class="optimizerDuck.UI.Pages.ScheduledTasksPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:scheduledTask="clr-namespace:optimizerDuck.Core.Models.Optimization.ScheduledTask"
+ xmlns:scheduledTask="clr-namespace:optimizerDuck.Domain.Optimizations.Models.ScheduledTask"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml.cs b/optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml.cs
similarity index 80%
rename from optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml.cs
rename to optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml.cs
index 684b2e2..ac56132 100644
--- a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/ScheduledTasks/ScheduledTasksPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class ScheduledTasksPage : INavigableView<ScheduledTasksViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/Settings/SettingsPage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/SettingsPage.xaml
rename to optimizerDuck/UI/Pages/Settings/SettingsPage.xaml
index 472b2af..3d76735 100644
--- a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Pages/Settings/SettingsPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
Title="SettingsPage"
@@ -8,13 +8,13 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.SettingsPage"
+ x:Class="optimizerDuck.UI.Pages.SettingsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml.cs b/optimizerDuck/UI/Pages/Settings/SettingsPage.xaml.cs
similarity index 79%
rename from optimizerDuck/UI/Views/Pages/SettingsPage.xaml.cs
rename to optimizerDuck/UI/Pages/Settings/SettingsPage.xaml.cs
index 9456aab..9f2c5ad 100644
--- a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/Settings/SettingsPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class SettingsPage : INavigableView<SettingsViewModel>
{
diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml
similarity index 99%
rename from optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
rename to optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml
index 52042d2..8e9f9f5 100644
--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml
@@ -1,4 +1,4 @@
-<Page
+<Page
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Margin="0,32,0,0"
ScrollViewer.CanContentScroll="False"
@@ -9,14 +9,14 @@
mc:Ignorable="d"
ui:Design.Background="Black"
ui:Design.Foreground="White"
- x:Class="optimizerDuck.UI.Views.Pages.StartupManagerPage"
+ x:Class="optimizerDuck.UI.Pages.StartupManagerPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:local="clr-namespace:optimizerDuck.UI.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:startupManager="clr-namespace:optimizerDuck.Core.Models.Optimization.StartupManager"
+ xmlns:startupManager="clr-namespace:optimizerDuck.Domain.Optimizations.Models.StartupManager"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml.cs b/optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml.cs
similarity index 80%
rename from optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml.cs
rename to optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml.cs
index ed7a0b0..4083feb 100644
--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml.cs
+++ b/optimizerDuck/UI/Pages/StartupManager/StartupManagerPage.xaml.cs
@@ -1,7 +1,7 @@
-using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Pages;
using Wpf.Ui.Abstractions.Controls;
-namespace optimizerDuck.UI.Views.Pages;
+namespace optimizerDuck.UI.Pages;
public partial class StartupManagerPage : INavigableView<StartupManagerViewModel>
{
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
index e5b1abd..8436969 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
@@ -1,12 +1,12 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.IO;
using System.Net.Http;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Optimization;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Managers;
using Wpf.Ui;
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs
index d4679df..0a9ea95 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationResultDialogViewModel.cs
@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
-using optimizerDuck.Core.Models.Optimization;
+using optimizerDuck.Domain.Optimizations.Models;
namespace optimizerDuck.UI.ViewModels.Dialogs;
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs
index 35f3f0e..0a262f7 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/ProcessingViewModel.cs
@@ -1,5 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using optimizerDuck.Core.Models.UI;
+using CommunityToolkit.Mvvm.ComponentModel;
+using optimizerDuck.Domain.UI;
namespace optimizerDuck.UI.ViewModels.Dialogs;
diff --git a/optimizerDuck/UI/ViewModels/Features/FeatureCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Features/FeatureCategoryViewModel.cs
index 162d1da..e61f1e6 100644
--- a/optimizerDuck/UI/ViewModels/Features/FeatureCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Features/FeatureCategoryViewModel.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Features;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Features.Models;
using optimizerDuck.Resources.Languages;
using optimizerDuck.UI.ViewModels.Features;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
index d095d88..064dd41 100644
--- a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
@@ -1,8 +1,8 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Execution;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Execution;
using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Features;
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index 6054a18..1028a07 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Net.Http;
@@ -8,15 +8,15 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Config;
-using optimizerDuck.Core.Models.Optimization;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Abstractions;
+using optimizerDuck.Domain.Configuration;
+using optimizerDuck.Domain.Optimizations.Models;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using optimizerDuck.UI.ViewModels.Dialogs;
-using optimizerDuck.UI.Views.Dialogs;
+using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
using TextBlock = Wpf.Ui.Controls.TextBlock;
diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/Bloatware/BloatwareViewModel.cs
similarity index 96%
rename from optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/Bloatware/BloatwareViewModel.cs
index cad8c31..7172902 100644
--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/Bloatware/BloatwareViewModel.cs
@@ -1,17 +1,17 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
-using optimizerDuck.Core.Models.Optimization.Bloatware;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Optimizations.Models.Bloatware;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
using optimizerDuck.UI.ViewModels.Dialogs;
-using optimizerDuck.UI.Views.Dialogs;
+using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
-using AppXPackage = optimizerDuck.Core.Models.Optimization.Bloatware.AppXPackage;
+using AppXPackage = optimizerDuck.Domain.Optimizations.Models.Bloatware.AppXPackage;
namespace optimizerDuck.UI.ViewModels.Pages;
diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/Dashboard/DashboardViewModel.cs
similarity index 99%
rename from optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/Dashboard/DashboardViewModel.cs
index fc19895..96ce58d 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/Dashboard/DashboardViewModel.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.Windows.Media;
using System.Windows.Threading;
using CommunityToolkit.Mvvm.ComponentModel;
diff --git a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DiskCleanup/DiskCleanupViewModel.cs
similarity index 98%
rename from optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/DiskCleanup/DiskCleanupViewModel.cs
index 1647d57..7e3bbda 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/DiskCleanup/DiskCleanupViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Diagnostics;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
@@ -7,7 +7,7 @@ using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
using Wpf.Ui;
using Wpf.Ui.Controls;
-using CleanupItem = optimizerDuck.Core.Models.Optimization.Cleanup.CleanupItem;
+using CleanupItem = optimizerDuck.Domain.Optimizations.Models.Cleanup.CleanupItem;
namespace optimizerDuck.UI.ViewModels.Pages;
diff --git a/optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/Features/FeaturesViewModel.cs
similarity index 96%
rename from optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/Features/FeaturesViewModel.cs
index 60770d7..14f8a86 100644
--- a/optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/Features/FeaturesViewModel.cs
@@ -1,8 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Reflection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
-using optimizerDuck.Core.Models.Attributes;
+using optimizerDuck.Domain.Attributes;
using optimizerDuck.Services;
using Wpf.Ui;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/Optimize/OptimizeViewModel.cs
similarity index 92%
rename from optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/Optimize/OptimizeViewModel.cs
index 8cd40c7..ed6cc1c 100644
--- a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/Optimize/OptimizeViewModel.cs
@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Reflection;
-using optimizerDuck.Core.Models.Attributes;
+using optimizerDuck.Domain.Attributes;
using optimizerDuck.Services;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasks/ScheduledTasksViewModel.cs
similarity index 98%
rename from optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/ScheduledTasks/ScheduledTasksViewModel.cs
index f1d1453..b8feef4 100644
--- a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasks/ScheduledTasksViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -6,10 +6,10 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.OptimizationServices;
-using optimizerDuck.UI.Views.Dialogs;
+using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
-using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;
+using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
namespace optimizerDuck.UI.ViewModels.Pages;
diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/Settings/SettingsViewModel.cs
similarity index 98%
rename from optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/Settings/SettingsViewModel.cs
index 5209378..0279fe1 100644
--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/Settings/SettingsViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Globalization;
using System.Windows.Media;
@@ -7,8 +7,8 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
-using optimizerDuck.Core.Models.Config;
-using optimizerDuck.Core.Models.UI;
+using optimizerDuck.Domain.Configuration;
+using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
diff --git a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/StartupManager/StartupManagerViewModel.cs
similarity index 96%
rename from optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs
rename to optimizerDuck/UI/ViewModels/Pages/StartupManager/StartupManagerViewModel.cs
index fc4874e..ebe1747 100644
--- a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/StartupManager/StartupManagerViewModel.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Diagnostics;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -6,11 +6,11 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
-using optimizerDuck.UI.Views.Dialogs;
+using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
-using StartupApp = optimizerDuck.Core.Models.Optimization.StartupManager.StartupApp;
-using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;
+using StartupApp = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupApp;
+using StartupTask = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupTask;
namespace optimizerDuck.UI.ViewModels.Pages;
diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xaml
similarity index 95%
rename from optimizerDuck/UI/Views/Windows/MainWindow.xaml
rename to optimizerDuck/UI/Windows/MainWindow.xaml
index 141f48b..3a328dc 100644
--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml
@@ -1,14 +1,14 @@
<ui:FluentWindow
- x:Class="optimizerDuck.UI.Views.Windows.MainWindow"
+ x:Class="optimizerDuck.UI.Windows.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:optimizerDuck.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
+ xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:windows="clr-namespace:optimizerDuck.UI.Views.Windows"
+ xmlns:windows="clr-namespace:optimizerDuck.UI.Windows"
Title="optimizerDuck"
Width="1350"
Height="800"
diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
similarity index 90%
rename from optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs
rename to optimizerDuck/UI/Windows/MainWindow.xaml.cs
index 68e2342..9a4bd71 100644
--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
@@ -1,11 +1,11 @@
using System.Windows;
-using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Services;
-using optimizerDuck.UI.Views.Pages;
+using optimizerDuck.UI.Pages;
using Wpf.Ui;
using Wpf.Ui.Abstractions;
-namespace optimizerDuck.UI.Views.Windows;
+namespace optimizerDuck.UI.Windows;
public partial class MainWindow : IWindow
{
diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csproj
index eb308d8..d4bd458 100644
--- a/optimizerDuck/optimizerDuck.csproj
+++ b/optimizerDuck/optimizerDuck.csproj
@@ -25,17 +25,17 @@
</PropertyGroup>
<ItemGroup>
- <Page Update="Views\Windows\MainWindow.xaml">
+ <Page Update="UI\Windows\MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
- <Page Update="Views\Pages\Optimizations\OptimizationPage.xaml">
+ <Page Update="UI\Pages\Optimize\Categories\OptimizationPage.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
- <Page Update="UI\Views\Pages\FeaturesPage.xaml">
+ <Page Update="UI\Pages\Features\FeaturesPage.xaml">
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>