diff --git a/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj b/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj
index 0d84fae5b..0cf47d537 100644
--- a/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj
+++ b/tools/config/TR1X_ConfigTool/TR1X_ConfigTool.csproj
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>disable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
     <UseWpf>true</UseWpf>
-    <UseWindowsForms>true</UseWindowsForms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <AssemblyName>TR1X_ConfigTool</AssemblyName>
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>false</PublishTrimmed>
@@ -23,10 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="out\**" />
-    <EmbeddedResource Remove="out\**" />
-    <None Remove="out\**" />
-    <Page Remove="out\**" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -65,10 +62,5 @@
     <EmbeddedResource Include="Resources\Lang\fr.json" />
     <EmbeddedResource Include="Resources\Lang\it.json" />
     <EmbeddedResource Include="Resources\specification.json" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tools/config/TR1X_ConfigTool/app.manifest b/tools/config/TR1X_ConfigTool/app.manifest
index ce145c9c0..c9bc2e2ff 100644
--- a/tools/config/TR1X_ConfigTool/app.manifest
+++ b/tools/config/TR1X_ConfigTool/app.manifest
@@ -10,8 +10,7 @@
           version="6.0.0.0"
           processorArchitecture="*"
           publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
+          language="*"/>
     </dependentAssembly>
   </dependency>
 </assembly>
diff --git a/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj b/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj
index 0c5ed5910..f3a5ac222 100644
--- a/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj
+++ b/tools/config/TR2X_ConfigTool/TR2X_ConfigTool.csproj
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>disable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
     <UseWpf>true</UseWpf>
-    <UseWindowsForms>true</UseWindowsForms>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <AssemblyName>TR2X_ConfigTool</AssemblyName>
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishTrimmed>false</PublishTrimmed>
@@ -23,10 +22,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="out\**" />
-    <EmbeddedResource Remove="out\**" />
-    <None Remove="out\**" />
-    <Page Remove="out\**" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -59,10 +56,5 @@
     <EmbeddedResource Include="Resources\Lang\en.json" />
     <EmbeddedResource Include="Resources\Lang\it.json" />
     <EmbeddedResource Include="Resources\specification.json" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\TRX_ConfigToolLib\TRX_ConfigToolLib.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tools/config/TR2X_ConfigTool/app.manifest b/tools/config/TR2X_ConfigTool/app.manifest
index 11e012ec9..403326a7d 100644
--- a/tools/config/TR2X_ConfigTool/app.manifest
+++ b/tools/config/TR2X_ConfigTool/app.manifest
@@ -10,8 +10,7 @@
           version="6.0.0.0"
           processorArchitecture="*"
           publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
+          language="*"/>
     </dependentAssembly>
   </dependency>
 </assembly>
diff --git a/tools/config/TRX_ConfigToolLib/Controls/AboutWindow.xaml b/tools/config/TRX_ConfigToolLib/Controls/AboutWindow.xaml
index 888098dec..73f1b237a 100644
--- a/tools/config/TRX_ConfigToolLib/Controls/AboutWindow.xaml
+++ b/tools/config/TRX_ConfigToolLib/Controls/AboutWindow.xaml
@@ -4,7 +4,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:TRX_ConfigToolLib.Models"
     mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=models:AboutWindowViewModel}"
     Title="{Binding ViewText[window_title_about]}"
     SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterOwner"
diff --git a/tools/config/TRX_ConfigToolLib/Controls/CategoryControl.xaml b/tools/config/TRX_ConfigToolLib/Controls/CategoryControl.xaml
index c5619156b..f8449e4e4 100644
--- a/tools/config/TRX_ConfigToolLib/Controls/CategoryControl.xaml
+++ b/tools/config/TRX_ConfigToolLib/Controls/CategoryControl.xaml
@@ -5,7 +5,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:TRX_ConfigToolLib.Controls"
+    xmlns:models="clr-namespace:TRX_ConfigToolLib.Models"
     mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=models:CategoryViewModel}"
     d:DesignHeight="450"
     d:DesignWidth="800">
 
diff --git a/tools/config/TRX_ConfigToolLib/Controls/PropertyControl.xaml b/tools/config/TRX_ConfigToolLib/Controls/PropertyControl.xaml
index 4e6914d52..dec47a92b 100644
--- a/tools/config/TRX_ConfigToolLib/Controls/PropertyControl.xaml
+++ b/tools/config/TRX_ConfigToolLib/Controls/PropertyControl.xaml
@@ -5,9 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:TRX_ConfigToolLib.Controls"
-    xmlns:models="clr-namespace:TRX_ConfigToolLib.Models"
-    xmlns:utils="clr-namespace:TRX_ConfigToolLib.Utils"
+    xmlns:models="clr-namespace:TRX_ConfigToolLib.Models.Specification"
+    xmlns:types="clr-namespace:TRX_ConfigToolLib.Models.Specification.Types"
+    xmlns:converters="clr-namespace:TRX_ConfigToolLib.Utils.Converters"
     mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=models:BaseProperty}"
     d:DesignHeight="450"
     d:DesignWidth="800">
 
@@ -16,11 +18,11 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/TRX_ConfigToolLib;component/Resources/styles.xaml" />
                 <ResourceDictionary>
-                    <utils:BoolToVisibilityConverter
+                    <converters:BoolToVisibilityConverter
                         x:Key="BoolToCollapsedConverter"
                         FalseValue="Collapsed"
                         TrueValue="Visible"/>
-                    <utils:BoolToVisibilityConverter
+                    <converters:BoolToVisibilityConverter
                         x:Key="InverseBoolToCollapsedConverter"
                         FalseValue="Visible"
                         TrueValue="Collapsed"/>
@@ -43,14 +45,14 @@
             HorizontalAlignment="Left"
             Visibility="{Binding IsEnabled, Converter={StaticResource BoolToCollapsedConverter}}">
             <ContentControl.Resources>
-                <DataTemplate DataType="{x:Type models:BoolProperty}">
+                <DataTemplate DataType="{x:Type types:BoolProperty}">
                     <CheckBox
                         IsChecked="{Binding Value, Mode=TwoWay}"
                         Content="{Binding DataContext.ViewText[checkbox_enabled], RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
                         Style="{StaticResource PropertyCheckboxStyle}"/>
                 </DataTemplate>
 
-                <DataTemplate DataType="{x:Type models:EnumProperty}">
+                <DataTemplate DataType="{x:Type types:EnumProperty}">
                     <ComboBox
                         ItemsSource="{Binding Options}"
                         SelectedItem="{Binding Value, Mode=TwoWay}"
@@ -58,7 +60,7 @@
                         Style="{StaticResource PropertyComboBoxStyle}"/>
                 </DataTemplate>
 
-                <DataTemplate DataType="{x:Type models:NumericProperty}">
+                <DataTemplate DataType="{x:Type types:NumericProperty}">
                     <controls:NumericUpDown
                         MinValue="{Binding MinimumValue}"
                         MaxValue="{Binding MaximumValue}"
diff --git a/tools/config/TRX_ConfigToolLib/Controls/TRXConfigWindow.xaml b/tools/config/TRX_ConfigToolLib/Controls/TRXConfigWindow.xaml
index a169c268c..0fd5007ac 100644
--- a/tools/config/TRX_ConfigToolLib/Controls/TRXConfigWindow.xaml
+++ b/tools/config/TRX_ConfigToolLib/Controls/TRXConfigWindow.xaml
@@ -5,8 +5,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="clr-namespace:TRX_ConfigToolLib.Controls"
+    xmlns:models="clr-namespace:TRX_ConfigToolLib.Models"
     xmlns:utils="clr-namespace:TRX_ConfigToolLib.Utils"
+    xmlns:converters="clr-namespace:TRX_ConfigToolLib.Utils.Converters"
     mc:Ignorable="d"
+    d:DataContext="{d:DesignInstance Type=models:MainWindowViewModel}"
     ResizeMode="CanResizeWithGrip"
     WindowStartupLocation="CenterScreen"
     Loaded="Window_Loaded"
@@ -22,15 +25,15 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/TRX_ConfigToolLib;component/Resources/styles.xaml" />
                 <ResourceDictionary>
-                    <utils:BoolToVisibilityConverter
+                    <converters:BoolToVisibilityConverter
                         x:Key="BoolToCollapsedConverter"
                         FalseValue="Collapsed"
                         TrueValue="Visible"/>
-                    <utils:BoolToVisibilityConverter
+                    <converters:BoolToVisibilityConverter
                         x:Key="InverseBoolToCollapsedConverter"
                         FalseValue="Visible"
                         TrueValue="Collapsed"/>
-                    <utils:BoolToVisibilityConverter
+                    <converters:BoolToVisibilityConverter
                         x:Key="BoolToHiddenConverter"
                         FalseValue="Hidden"
                         TrueValue="Visible"/>
@@ -126,7 +129,7 @@
                     Grid.Column="1"
                     BorderBrush="#666"
                     BorderThickness="1"
-                    Background="{Binding SearchFailStatus, Converter={utils:ConditionalMarkupConverter TrueValue='#FFC7CE', FalseValue='White'}}">
+                    Background="{Binding SearchFailStatus, Converter={converters:ConditionalMarkupConverter TrueValue='#FFC7CE', FalseValue='White'}}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="300"/>
@@ -201,8 +204,8 @@
                 Visibility="{Binding IsEditorActive, Converter={StaticResource BoolToHiddenConverter}}"/>
             <StatusBarItem>
                 <TextBlock
-                    Text="{Binding IsEditorDirty, Converter={utils:ConditionalViewTextConverter TrueValue='label_unsaved', FalseValue='label_saved'}}"
-                    Foreground="{Binding IsEditorDirty, Converter={utils:ConditionalMarkupConverter TrueValue='DarkRed', FalseValue='DarkGreen'}}"
+                    Text="{Binding IsEditorDirty, Converter={converters:ConditionalViewTextConverter TrueValue='label_unsaved', FalseValue='label_saved'}}"
+                    Foreground="{Binding IsEditorDirty, Converter={converters:ConditionalMarkupConverter TrueValue='DarkRed', FalseValue='DarkGreen'}}"
                     FontWeight="Bold"
                     Visibility="{Binding IsEditorActive, Converter={StaticResource BoolToHiddenConverter}}"/>
             </StatusBarItem>
diff --git a/tools/config/TRX_ConfigToolLib/Models/BaseLanguageViewModel.cs b/tools/config/TRX_ConfigToolLib/Models/BaseLanguageViewModel.cs
index cff2ea8d5..385e3aa27 100644
--- a/tools/config/TRX_ConfigToolLib/Models/BaseLanguageViewModel.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/BaseLanguageViewModel.cs
@@ -1,4 +1,7 @@
-namespace TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Lang;
+using TRX_ConfigToolLib.Utils;
+
+namespace TRX_ConfigToolLib.Models;
 
 public class BaseLanguageViewModel : BaseNotifyPropertyChanged
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/CategoryViewModel.cs b/tools/config/TRX_ConfigToolLib/Models/CategoryViewModel.cs
index fc56a2867..94dac58d1 100644
--- a/tools/config/TRX_ConfigToolLib/Models/CategoryViewModel.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/CategoryViewModel.cs
@@ -1,4 +1,5 @@
-using TRX_ConfigToolLib.Utils;
+using TRX_ConfigToolLib.Models.Specification;
+using TRX_ConfigToolLib.Utils;
 
 namespace TRX_ConfigToolLib.Models;
 
diff --git a/tools/config/TRX_ConfigToolLib/Models/Lang/Language.cs b/tools/config/TRX_ConfigToolLib/Models/Lang/Language.cs
index 2c44763b3..1b8e6139d 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Lang/Language.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Lang/Language.cs
@@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq;
 using System.Globalization;
 using TRX_ConfigToolLib.Utils;
 
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Lang;
 
 public class Language
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Lang/PropertyText.cs b/tools/config/TRX_ConfigToolLib/Models/Lang/PropertyText.cs
index c11a006c2..3f300118f 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Lang/PropertyText.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Lang/PropertyText.cs
@@ -1,4 +1,4 @@
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Lang;
 
 public class PropertyText
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/MainWindowViewModel.cs b/tools/config/TRX_ConfigToolLib/Models/MainWindowViewModel.cs
index 45266f259..e93e9d8f5 100644
--- a/tools/config/TRX_ConfigToolLib/Models/MainWindowViewModel.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/MainWindowViewModel.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Windows;
 using System.Windows.Input;
 using TRX_ConfigToolLib.Controls;
+using TRX_ConfigToolLib.Models.Specification;
 using TRX_ConfigToolLib.Utils;
 
 namespace TRX_ConfigToolLib.Models;
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/BaseProperty.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/BaseProperty.cs
index 2b4b2a2fe..79f671dd6 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/BaseProperty.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/BaseProperty.cs
@@ -1,6 +1,7 @@
-using TRX_ConfigToolLib.Utils;
+using TRX_ConfigToolLib.Models.Lang;
+using TRX_ConfigToolLib.Utils;
 
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public abstract class BaseProperty : BaseNotifyPropertyChanged
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Category.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Category.cs
index 317cb502e..3600a78d6 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Category.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Category.cs
@@ -1,4 +1,6 @@
-namespace TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Lang;
+
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public class Category
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Configuration.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Configuration.cs
index f9ca4e30a..202b323b8 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Configuration.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Configuration.cs
@@ -2,8 +2,9 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.IO;
 using TRX_ConfigToolLib.Utils;
+using TRX_ConfigToolLib.Utils.Json;
 
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public class Configuration
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/DataType.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/DataType.cs
index 3766f58ee..d807329ee 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/DataType.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/DataType.cs
@@ -1,4 +1,4 @@
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public enum DataType
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/EnumOption.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/EnumOption.cs
index 5b8ed1107..f80eaad37 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/EnumOption.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/EnumOption.cs
@@ -1,4 +1,6 @@
-namespace TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Lang;
+
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public class EnumOption
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Specification.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Specification.cs
index 43da7c44f..2a6ba7af5 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Specification.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Specification.cs
@@ -1,8 +1,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using TRX_ConfigToolLib.Utils;
+using TRX_ConfigToolLib.Utils.Json;
 
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification;
 
 public class Specification
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/BoolProperty.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/BoolProperty.cs
index 32ed4b4aa..3b7bc6eda 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/BoolProperty.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/BoolProperty.cs
@@ -1,4 +1,4 @@
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification.Types;
 
 public class BoolProperty : BaseProperty
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/EnumProperty.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/EnumProperty.cs
index 4da283292..45b105f03 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/EnumProperty.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/EnumProperty.cs
@@ -1,4 +1,4 @@
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification.Types;
 
 public class EnumProperty : BaseProperty
 {
diff --git a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/NumericProperty.cs b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/NumericProperty.cs
index 37422a000..4c4e15344 100644
--- a/tools/config/TRX_ConfigToolLib/Models/Specification/Types/NumericProperty.cs
+++ b/tools/config/TRX_ConfigToolLib/Models/Specification/Types/NumericProperty.cs
@@ -1,4 +1,4 @@
-namespace TRX_ConfigToolLib.Models;
+namespace TRX_ConfigToolLib.Models.Specification.Types;
 
 public class NumericProperty : BaseProperty
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/BaseNotifyPropertyChanged.cs b/tools/config/TRX_ConfigToolLib/Utils/BaseNotifyPropertyChanged.cs
index 3bdaa5c1f..c5eef5ecc 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/BaseNotifyPropertyChanged.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/BaseNotifyPropertyChanged.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace TRX_ConfigToolLib;
+namespace TRX_ConfigToolLib.Utils;
 
 public abstract class BaseNotifyPropertyChanged : INotifyPropertyChanged
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Converters/BoolToVisibilityConverter.cs b/tools/config/TRX_ConfigToolLib/Utils/Converters/BoolToVisibilityConverter.cs
index 2bf988719..a443fba96 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Converters/BoolToVisibilityConverter.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Converters/BoolToVisibilityConverter.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Converters;
 
 [ValueConversion(typeof(bool), typeof(Visibility))]
 public class BoolToVisibilityConverter : IValueConverter
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalMarkupConverter.cs b/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalMarkupConverter.cs
index 2ec09526a..847a691bf 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalMarkupConverter.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalMarkupConverter.cs
@@ -2,7 +2,7 @@ using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Markup;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Converters;
 
 public class ConditionalMarkupConverter : MarkupExtension, IValueConverter
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalViewTextConverter.cs b/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalViewTextConverter.cs
index f350b5c0f..da0348b87 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalViewTextConverter.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Converters/ConditionalViewTextConverter.cs
@@ -1,7 +1,7 @@
 using System.Globalization;
-using TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Lang;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Converters;
 
 public class ConditionalViewTextConverter : ConditionalMarkupConverter
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Json/NumericConverter.cs b/tools/config/TRX_ConfigToolLib/Utils/Json/NumericConverter.cs
index f0a288592..a386315a7 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Json/NumericConverter.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Json/NumericConverter.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Globalization;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Json;
 
 public class NumericConverter : JsonConverter<decimal>
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyConverter.cs b/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyConverter.cs
index 53b87d08c..084a6655e 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyConverter.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyConverter.cs
@@ -1,8 +1,9 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Specification;
+using TRX_ConfigToolLib.Models.Specification.Types;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Json;
 
 public class PropertyConverter : JsonConverter
 {
diff --git a/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyResolver.cs b/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyResolver.cs
index 038cacaca..cb0f05469 100644
--- a/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyResolver.cs
+++ b/tools/config/TRX_ConfigToolLib/Utils/Json/PropertyResolver.cs
@@ -1,8 +1,8 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using TRX_ConfigToolLib.Models;
+using TRX_ConfigToolLib.Models.Specification;
 
-namespace TRX_ConfigToolLib.Utils;
+namespace TRX_ConfigToolLib.Utils.Json;
 
 public class PropertyResolver : DefaultContractResolver
 {