diff --git a/src/Microsoft.Extensions.ProjectModel/DiagnosticMessageExtensions.cs b/src/Microsoft.Extensions.ProjectModel/DiagnosticMessageExtensions.cs
deleted file mode 100644
index 87a81b7ba..000000000
--- a/src/Microsoft.Extensions.ProjectModel/DiagnosticMessageExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.Extensions.ProjectModel
-{
-    public static class DiagnosticMessageExtensions
-    {
-        /// <summary>
-        /// Returns true if <paramref name="messages"/> has at least one message with <see cref="DiagnosticMessageSeverity.Error"/>.
-        /// </summary>
-        /// <param name="messages">Sequence of <see cref="DiagnosticMessage"/> objects.</param>
-        /// <returns><c>true</c> if any messages is an error message, <c>false</c> otherwise.</returns>
-        public static bool HasErrors(this IEnumerable<DiagnosticMessage> messages)
-        {
-            return messages.Any(m => m.Severity == DiagnosticMessageSeverity.Error);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.Extensions.ProjectModel/Utilities/NamedResourceReader.cs b/src/Microsoft.Extensions.ProjectModel/Files/NamedResourceReader.cs
similarity index 98%
rename from src/Microsoft.Extensions.ProjectModel/Utilities/NamedResourceReader.cs
rename to src/Microsoft.Extensions.ProjectModel/Files/NamedResourceReader.cs
index d759f8a03..bb05b3329 100644
--- a/src/Microsoft.Extensions.ProjectModel/Utilities/NamedResourceReader.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Files/NamedResourceReader.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel.Utilities
+namespace Microsoft.Extensions.ProjectModel.Files
 {
     internal static class NamedResourceReader
     {
diff --git a/src/Microsoft.Extensions.ProjectModel/PackIncludeEntry.cs b/src/Microsoft.Extensions.ProjectModel/Files/PackIncludeEntry.cs
similarity index 95%
rename from src/Microsoft.Extensions.ProjectModel/PackIncludeEntry.cs
rename to src/Microsoft.Extensions.ProjectModel/Files/PackIncludeEntry.cs
index 369638f80..08a8679b7 100644
--- a/src/Microsoft.Extensions.ProjectModel/PackIncludeEntry.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Files/PackIncludeEntry.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.Extensions.ProjectModel.Files
 {
     public class PackIncludeEntry
     {
diff --git a/src/Microsoft.Extensions.ProjectModel/PatternGroup.cs b/src/Microsoft.Extensions.ProjectModel/Files/PatternGroup.cs
similarity index 99%
rename from src/Microsoft.Extensions.ProjectModel/PatternGroup.cs
rename to src/Microsoft.Extensions.ProjectModel/Files/PatternGroup.cs
index 78ed288cf..1911f6335 100644
--- a/src/Microsoft.Extensions.ProjectModel/PatternGroup.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Files/PatternGroup.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.Extensions.ProjectModel.Files
 {
     public class PatternGroup
     {
diff --git a/src/Microsoft.Extensions.ProjectModel/PatternsCollectionHelper.cs b/src/Microsoft.Extensions.ProjectModel/Files/PatternsCollectionHelper.cs
similarity index 98%
rename from src/Microsoft.Extensions.ProjectModel/PatternsCollectionHelper.cs
rename to src/Microsoft.Extensions.ProjectModel/Files/PatternsCollectionHelper.cs
index 169f593da..226ac4574 100644
--- a/src/Microsoft.Extensions.ProjectModel/PatternsCollectionHelper.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Files/PatternsCollectionHelper.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.Extensions.JsonParser.Sources;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.Extensions.ProjectModel.Files
 {
     internal static class PatternsCollectionHelper
     {
diff --git a/src/Microsoft.Extensions.ProjectModel/ProjectFilesCollection.cs b/src/Microsoft.Extensions.ProjectModel/Files/ProjectFilesCollection.cs
similarity index 98%
rename from src/Microsoft.Extensions.ProjectModel/ProjectFilesCollection.cs
rename to src/Microsoft.Extensions.ProjectModel/Files/ProjectFilesCollection.cs
index e449d52e1..f7fc5a1c2 100644
--- a/src/Microsoft.Extensions.ProjectModel/ProjectFilesCollection.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Files/ProjectFilesCollection.cs
@@ -6,9 +6,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.JsonParser.Sources;
-using Microsoft.Extensions.ProjectModel.Utilities;
 
-namespace Microsoft.Extensions.ProjectModel
+namespace Microsoft.Extensions.ProjectModel.Files
 {
     public class ProjectFilesCollection
     {
diff --git a/src/Microsoft.Extensions.ProjectModel/Project.cs b/src/Microsoft.Extensions.ProjectModel/Project.cs
index 5c7ea2172..2eb19d68a 100644
--- a/src/Microsoft.Extensions.ProjectModel/Project.cs
+++ b/src/Microsoft.Extensions.ProjectModel/Project.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Microsoft.Extensions.ProjectModel.Files;
 using Microsoft.Extensions.ProjectModel.Graph;
 using Microsoft.Extensions.ProjectModel.Utilities;
 using NuGet.Frameworks;
diff --git a/src/Microsoft.Extensions.ProjectModel/ProjectReader.cs b/src/Microsoft.Extensions.ProjectModel/ProjectReader.cs
index b7961f7ac..97c2affe9 100644
--- a/src/Microsoft.Extensions.ProjectModel/ProjectReader.cs
+++ b/src/Microsoft.Extensions.ProjectModel/ProjectReader.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.Extensions.JsonParser.Sources;
+using Microsoft.Extensions.ProjectModel.Files;
 using Microsoft.Extensions.ProjectModel.Graph;
 using NuGet.Frameworks;
 using NuGet.Versioning;