diff --git a/Core/Models/TagDatabase/TagDatabase.ImportMethods.cs b/Core/Models/TagDatabase/TagDatabase.ImportMethods.cs
index 5d7b0a3..beb2846 100644
--- a/Core/Models/TagDatabase/TagDatabase.ImportMethods.cs
+++ b/Core/Models/TagDatabase/TagDatabase.ImportMethods.cs
@@ -32,7 +32,9 @@ public partial class TagDatabase
                 }
                 if (currentTag is null)
                     throw new InvalidOperationException(ErrorMessages.TagDatabaseTagNotFound);
-                // todo search parent here then save the parents.
+                
+                
+                // todo search parent here then save the parent IDs.
                 await this.SaveTagParents(transaction, currentTag.Id, tag.Parents, currentTag).ConfigureAwait(false);
             }
 
diff --git a/UI/App.axaml.cs b/UI/App.axaml.cs
index 228630c..4a8797b 100644
--- a/UI/App.axaml.cs
+++ b/UI/App.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Data.Core.Plugins;
 using Avalonia.Markup.Xaml;
+using TagHierarchyManager.UI.Services;
 using TagHierarchyManager.UI.ViewModels;
 using TagHierarchyManager.UI.Views;
 
diff --git a/UI/DialogService.cs b/UI/Services/DialogService.cs
similarity index 95%
rename from UI/DialogService.cs
rename to UI/Services/DialogService.cs
index 89e431c..59decbd 100644
--- a/UI/DialogService.cs
+++ b/UI/Services/DialogService.cs
@@ -7,7 +7,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using TagHierarchyManager.UI.ViewModels;
 using TagHierarchyManager.UI.Views;
 
-namespace TagHierarchyManager.UI;
+namespace TagHierarchyManager.UI.Services;
 
 public class DialogService
 {
diff --git a/UI/TagDatabaseService.cs b/UI/Services/TagDatabaseService.cs
similarity index 99%
rename from UI/TagDatabaseService.cs
rename to UI/Services/TagDatabaseService.cs
index 885f953..735918f 100644
--- a/UI/TagDatabaseService.cs
+++ b/UI/Services/TagDatabaseService.cs
@@ -15,7 +15,7 @@ using TagHierarchyManager.UI.Assets;
 using TagHierarchyManager.UI.ViewModels;
 using TagHierarchyManager.UI.Views;
 
-namespace TagHierarchyManager.UI;
+namespace TagHierarchyManager.UI.Services;
 
 public class TagDatabaseService : ObservableObject
 {
diff --git a/UI/ViewModels/BulkAddViewModel.cs b/UI/ViewModels/BulkAddViewModel.cs
index 2ab075e..cc76986 100644
--- a/UI/ViewModels/BulkAddViewModel.cs
+++ b/UI/ViewModels/BulkAddViewModel.cs
@@ -3,11 +3,11 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
-using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.Models;
 using TagHierarchyManager.UI.Assets;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.ViewModels;
 
diff --git a/UI/ViewModels/HierarchyTreeViewModel.cs b/UI/ViewModels/HierarchyTreeViewModel.cs
index e7e1c48..d514211 100644
--- a/UI/ViewModels/HierarchyTreeViewModel.cs
+++ b/UI/ViewModels/HierarchyTreeViewModel.cs
@@ -8,6 +8,7 @@ using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.Models;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.ViewModels;
 
diff --git a/UI/ViewModels/ImportDialogViewModel.cs b/UI/ViewModels/ImportDialogViewModel.cs
index 6391277..ef52f0a 100644
--- a/UI/ViewModels/ImportDialogViewModel.cs
+++ b/UI/ViewModels/ImportDialogViewModel.cs
@@ -6,6 +6,7 @@ using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.UI.Assets;
+using TagHierarchyManager.UI.Services;
 using TagHierarchyManager.UI.Views;
 
 namespace TagHierarchyManager.UI.ViewModels;
diff --git a/UI/ViewModels/MainWindowViewModel.cs b/UI/ViewModels/MainWindowViewModel.cs
index e2a394f..c602c60 100644
--- a/UI/ViewModels/MainWindowViewModel.cs
+++ b/UI/ViewModels/MainWindowViewModel.cs
@@ -10,6 +10,7 @@ using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.UI.Assets;
+using TagHierarchyManager.UI.Services;
 using TagHierarchyManager.UI.Views;
 
 namespace TagHierarchyManager.UI.ViewModels;
diff --git a/UI/ViewModels/SaveAmbiguousViewModel.cs b/UI/ViewModels/SaveAmbiguousViewModel.cs
index b88651f..542626b 100644
--- a/UI/ViewModels/SaveAmbiguousViewModel.cs
+++ b/UI/ViewModels/SaveAmbiguousViewModel.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using TagHierarchyManager.Models;
 using TagHierarchyManager.UI.Assets;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.ViewModels;
 
diff --git a/UI/ViewModels/SearchViewModel.cs b/UI/ViewModels/SearchViewModel.cs
index 5a81178..b20f8f9 100644
--- a/UI/ViewModels/SearchViewModel.cs
+++ b/UI/ViewModels/SearchViewModel.cs
@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.Common;
 using TagHierarchyManager.UI.Assets;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.ViewModels;
 
diff --git a/UI/ViewModels/TagEditorViewModel.cs b/UI/ViewModels/TagEditorViewModel.cs
index 1e3fc29..4ecf961 100644
--- a/UI/ViewModels/TagEditorViewModel.cs
+++ b/UI/ViewModels/TagEditorViewModel.cs
@@ -5,6 +5,7 @@ using CommunityToolkit.Mvvm.Input;
 using TagHierarchyManager.Models;
 using TagHierarchyManager.UI.Assets;
 using TagHierarchyManager.UI.Views;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.ViewModels;
 
diff --git a/UI/Views/Windows/MainWindow.axaml.cs b/UI/Views/Windows/MainWindow.axaml.cs
index e85a342..04d9a1d 100644
--- a/UI/Views/Windows/MainWindow.axaml.cs
+++ b/UI/Views/Windows/MainWindow.axaml.cs
@@ -2,6 +2,7 @@ using System;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using TagHierarchyManager.UI.ViewModels;
+using TagHierarchyManager.UI.Services;
 
 namespace TagHierarchyManager.UI.Views;