diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/JdeScoping.SecureStoreManager.Tests.csproj b/Deprecated/JdeScoping.SecureStoreManager.Tests/JdeScoping.SecureStoreManager.Tests.csproj
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/JdeScoping.SecureStoreManager.Tests.csproj
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/JdeScoping.SecureStoreManager.Tests.csproj
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/Services/SecureStoreManagerTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/Services/SecureStoreManagerTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/Services/SecureStoreManagerTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/Services/SecureStoreManagerTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/TestAppBuilder.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/TestAppBuilder.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/TestAppBuilder.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/TestAppBuilder.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/DialogViewModelTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/DialogViewModelTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/DialogViewModelTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/DialogViewModelTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/MainWindowViewModelTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/MainWindowViewModelTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/MainWindowViewModelTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/MainWindowViewModelTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/RelayCommandTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/RelayCommandTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/RelayCommandTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/RelayCommandTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/SecretItemViewModelTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/SecretItemViewModelTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/SecretItemViewModelTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/SecretItemViewModelTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/ViewModelBaseTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/ViewModelBaseTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/ViewModels/ViewModelBaseTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/ViewModels/ViewModelBaseTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/MainWindowTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/Views/MainWindowTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/MainWindowTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/Views/MainWindowTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/NewStoreDialogTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/Views/NewStoreDialogTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/NewStoreDialogTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/Views/NewStoreDialogTests.cs
diff --git a/NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/SecretEditDialogTests.cs b/Deprecated/JdeScoping.SecureStoreManager.Tests/Views/SecretEditDialogTests.cs
similarity index 100%
rename from NEW/tests/JdeScoping.SecureStoreManager.Tests/Views/SecretEditDialogTests.cs
rename to Deprecated/JdeScoping.SecureStoreManager.Tests/Views/SecretEditDialogTests.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/App.axaml b/Deprecated/JdeScoping.SecureStoreManager/App.axaml
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/App.axaml
rename to Deprecated/JdeScoping.SecureStoreManager/App.axaml
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/App.axaml.cs b/Deprecated/JdeScoping.SecureStoreManager/App.axaml.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/App.axaml.cs
rename to Deprecated/JdeScoping.SecureStoreManager/App.axaml.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Application/SecretUseCases.cs b/Deprecated/JdeScoping.SecureStoreManager/Application/SecretUseCases.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Application/SecretUseCases.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Application/SecretUseCases.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Application/StoreUseCases.cs b/Deprecated/JdeScoping.SecureStoreManager/Application/StoreUseCases.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Application/StoreUseCases.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Application/StoreUseCases.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Constants/DialogStrings.cs b/Deprecated/JdeScoping.SecureStoreManager/Constants/DialogStrings.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Constants/DialogStrings.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Constants/DialogStrings.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Constants/FileExtensions.cs b/Deprecated/JdeScoping.SecureStoreManager/Constants/FileExtensions.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Constants/FileExtensions.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Constants/FileExtensions.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Converters/BooleanConverters.cs b/Deprecated/JdeScoping.SecureStoreManager/Converters/BooleanConverters.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Converters/BooleanConverters.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Converters/BooleanConverters.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/JdeScoping.SecureStoreManager.csproj b/Deprecated/JdeScoping.SecureStoreManager/JdeScoping.SecureStoreManager.csproj
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/JdeScoping.SecureStoreManager.csproj
rename to Deprecated/JdeScoping.SecureStoreManager/JdeScoping.SecureStoreManager.csproj
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Program.cs b/Deprecated/JdeScoping.SecureStoreManager/Program.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Program.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Program.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/README.md b/Deprecated/JdeScoping.SecureStoreManager/README.md
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/README.md
rename to Deprecated/JdeScoping.SecureStoreManager/README.md
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/AvaloniaClipboardService.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/AvaloniaClipboardService.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/AvaloniaClipboardService.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/AvaloniaClipboardService.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/AvaloniaDialogService.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/AvaloniaDialogService.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/AvaloniaDialogService.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/AvaloniaDialogService.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/IClipboardService.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/IClipboardService.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/IClipboardService.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/IClipboardService.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/IDialogService.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/IDialogService.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/IDialogService.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/IDialogService.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/ISecureStoreManager.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/ISecureStoreManager.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/ISecureStoreManager.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/ISecureStoreManager.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Services/SecureStoreManager.cs b/Deprecated/JdeScoping.SecureStoreManager/Services/SecureStoreManager.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Services/SecureStoreManager.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Services/SecureStoreManager.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/AsyncRelayCommand.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/AsyncRelayCommand.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/AsyncRelayCommand.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/AsyncRelayCommand.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/DialogViewModels.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/DialogViewModels.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/DialogViewModels.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/DialogViewModels.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/MainWindowViewModel.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/MainWindowViewModel.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/MainWindowViewModel.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/RelayCommand.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/RelayCommand.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/RelayCommand.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/RelayCommand.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/SecretItemViewModel.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/SecretItemViewModel.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/SecretItemViewModel.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/SecretItemViewModel.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/ViewModelBase.cs b/Deprecated/JdeScoping.SecureStoreManager/ViewModels/ViewModelBase.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/ViewModels/ViewModelBase.cs
rename to Deprecated/JdeScoping.SecureStoreManager/ViewModels/ViewModelBase.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/MainWindow.axaml b/Deprecated/JdeScoping.SecureStoreManager/Views/MainWindow.axaml
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/MainWindow.axaml
rename to Deprecated/JdeScoping.SecureStoreManager/Views/MainWindow.axaml
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/MainWindow.axaml.cs b/Deprecated/JdeScoping.SecureStoreManager/Views/MainWindow.axaml.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/MainWindow.axaml.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Views/MainWindow.axaml.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml b/Deprecated/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml
rename to Deprecated/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml.cs b/Deprecated/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Views/NewStoreDialog.axaml.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml b/Deprecated/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml
rename to Deprecated/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml.cs b/Deprecated/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Views/OpenStoreDialog.axaml.cs
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml b/Deprecated/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml
rename to Deprecated/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml
diff --git a/NEW/src/Utils/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml.cs b/Deprecated/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml.cs
similarity index 100%
rename from NEW/src/Utils/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml.cs
rename to Deprecated/JdeScoping.SecureStoreManager/Views/SecretEditDialog.axaml.cs
diff --git a/NEW/JdeScoping.slnx b/NEW/JdeScoping.slnx
index 250a777..5233f45 100644
--- a/NEW/JdeScoping.slnx
+++ b/NEW/JdeScoping.slnx
@@ -13,7 +13,6 @@
-
@@ -28,6 +27,5 @@
-