diff --git a/UIX/Microsoft/Iris/Debug/Data/DataMappingModel.cs b/UIX/Microsoft/Iris/Debug/Data/DataMappingModel.cs
new file mode 100644
index 0000000..46cf749
--- /dev/null
+++ b/UIX/Microsoft/Iris/Debug/Data/DataMappingModel.cs
@@ -0,0 +1,15 @@
+namespace Microsoft.Iris.Debug.Data;
+
+public class DataMappingModel
+{
+    public DataMappingModel(string provider, string type, string generatedCode)
+    {
+        Provider = provider;
+        Type = type;
+        GeneratedCode = generatedCode;
+    }
+
+    public string Provider { get; internal set; }
+    public string Type { get; internal set; }
+    public string GeneratedCode { get; internal set; }
+}
diff --git a/UIX/Microsoft/Iris/Debug/Data/DecompilationResult.cs b/UIX/Microsoft/Iris/Debug/Data/DecompilationResult.cs
new file mode 100644
index 0000000..0552922
--- /dev/null
+++ b/UIX/Microsoft/Iris/Debug/Data/DecompilationResult.cs
@@ -0,0 +1,15 @@
+using System.Xml;
+
+namespace Microsoft.Iris.Debug.Data;
+
+public class DecompilationResult
+{
+    internal DecompilationResult(string context, XmlDocument doc)
+    {
+        Context = context;
+        Doc = doc;
+    }
+
+    public string Context { get; private set; }
+    public XmlDocument Doc { get; private set; }
+}
diff --git a/UIX/Microsoft/Iris/Debug/DebugSettings.cs b/UIX/Microsoft/Iris/Debug/DebugSettings.cs
index e6d12f8..ae28aef 100644
--- a/UIX/Microsoft/Iris/Debug/DebugSettings.cs
+++ b/UIX/Microsoft/Iris/Debug/DebugSettings.cs
@@ -1,53 +1,20 @@
-using System.Collections.Generic;
-using System.Xml;
+using Microsoft.Iris.Debug.Data;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
-#if NET40_OR_GREATER || NET6_0_OR_GREATER
-using DataMappingModelsList = System.Collections.ObjectModel.ObservableCollection<Microsoft.Iris.Debug.DataMappingModel>;
-using DecompileResultList = System.Collections.ObjectModel.ObservableCollection<Microsoft.Iris.Debug.DecompilationResult>;
-#else
-using DataMappingModelsList = System.Collections.Generic.List<Microsoft.Iris.Debug.DataMappingModel>;
-using DecompileResultList = System.Collections.Generic.List<Microsoft.Iris.Debug.DecompilationResult>;
-#endif
+namespace Microsoft.Iris.Debug;
 
-namespace Microsoft.Iris.Debug
+public class DebugSettings
 {
-    public class DebugSettings
-    {
-        public bool UseDecompiler { get; set; } = false;
-        public DecompileResultList DecompileResults { get; } = new DecompileResultList();
-        public TraceSettings TraceSettings { get; } = TraceSettings.Current;
+    public bool UseDecompiler { get; set; } = false;
+    public ObservableCollection<DecompilationResult> DecompileResults { get; } = new();
 
-        public bool GenerateDataMappingModels { get; set; } = false;
-        public DataMappingModelsList DataMappingModels { get; } = new DataMappingModelsList();
+    public TraceSettings TraceSettings { get; } = TraceSettings.Current;
 
-        public List<Breakpoint> Breakpoints { get; } = new();
+    public bool GenerateDataMappingModels { get; set; } = false;
+    public ObservableCollection<DataMappingModel> DataMappingModels { get; } = new();
 
-        public string DebugConnectionUri { get; set; }
-    }
+    public List<Breakpoint> Breakpoints { get; } = new();
 
-    public class DecompilationResult
-    {
-        internal DecompilationResult(string context, XmlDocument doc)
-        {
-            Context = context;
-            Doc = doc;
-        }
-
-        public string Context { get; private set; }
-        public XmlDocument Doc { get; private set; }
-    }
-
-    public class DataMappingModel
-    {
-        public DataMappingModel(string provider, string type, string generatedCode)
-        {
-            Provider = provider;
-            Type = type;
-            GeneratedCode = generatedCode;
-        }
-
-        public string Provider { get; internal set; }
-        public string Type { get; internal set; }
-        public string GeneratedCode { get; internal set; }
-    }
+    public string DebugConnectionUri { get; set; }
 }