diff --git a/README.md b/README.md
index 86302a48..aaa743aa 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![image](https://img.shields.io/github/actions/workflow/status/microsoft/PowerApps-Language-Tooling/CI.yml?branch=master)  ![image](https://img.shields.io/nuget/vpre/Microsoft.PowerPlatform.Formulas.Tools)
+![image](https://img.shields.io/github/actions/workflow/status/microsoft/PowerApps-Language-Tooling/CI.yml?branch=master)  ![image](https://img.shields.io/nuget/vpre/Microsoft.PowerPlatform.Formulas.Tools) [![Build Status](https://dev.azure.com/dynamicscrm/OneCRM/_apis/build/status%2FPowerPlatform.PowerApps.Tools%2Fmicrosoft.PowerApps-Tooling?branchName=master)](https://dev.azure.com/dynamicscrm/OneCRM/_build/latest?definitionId=21051&branchName=master)
 
 # Power Apps Source File Pack and Unpack Utility
 
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/FirstClassAttribute.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Attributes/FirstClassAttribute.cs
similarity index 84%
rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/FirstClassAttribute.cs
rename to src/Microsoft.PowerPlatform.PowerApps.Persistence/Attributes/FirstClassAttribute.cs
index 3e26a561..2f7d66d2 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/FirstClassAttribute.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Attributes/FirstClassAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
+namespace Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
 
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = false)]
 public class FirstClassAttribute : Attribute
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlPropertiesCollection.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Collections/ControlPropertiesCollection.cs
similarity index 92%
rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlPropertiesCollection.cs
rename to src/Microsoft.PowerPlatform.PowerApps.Persistence/Collections/ControlPropertiesCollection.cs
index 0ac5c269..caea3ada 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlPropertiesCollection.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Collections/ControlPropertiesCollection.cs
@@ -3,8 +3,9 @@
 
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 
-namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
+namespace Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
 
 public class ControlPropertiesCollection : IReadOnlyDictionary<string, ControlPropertyValue>
 {
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs
index 7b968e79..8dca589d 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.PowerPlatform.PowerApps.Persistence.Models;
+using Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
 
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Extensions;
 
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs
index 4ff054db..76bab048 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
+
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 
 [FirstClass(nameof(Button))]
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs
index 7236a6ce..5a7d0496 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
+
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 
 public abstract record Control
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Label.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Label.cs
index 43cfb129..33535b24 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Label.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Label.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
+
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 
 [FirstClass(nameof(Label))]
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs
index dc64801f..4d36c8c2 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
+
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 
 [FirstClass(nameof(Screen))]
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs
index efeee2de..b80a3e9f 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs
@@ -5,6 +5,7 @@
 using YamlDotNet.Serialization;
 using Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 using YamlDotNet.Core.Events;
+using Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
 
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Yaml;
 
diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs
index 15002e94..c854ae8c 100644
--- a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs
+++ b/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs
@@ -4,7 +4,7 @@
 using YamlDotNet.Serialization;
 using Microsoft.PowerPlatform.PowerApps.Persistence.Models;
 using YamlDotNet.Serialization.NamingConventions;
-using Label = Microsoft.PowerPlatform.PowerApps.Persistence.Models.Label;
+using Microsoft.PowerPlatform.PowerApps.Persistence.Attributes;
 
 namespace Microsoft.PowerPlatform.PowerApps.Persistence.Yaml;