From ac6ca84a8a49342c990f9a27f47d1bdc619bd190 Mon Sep 17 00:00:00 2001
From: Chris Cameron <chris.cameron@wedoresi.com>
Date: Thu, 6 Jul 2017 10:57:04 -0400
Subject: [PATCH] Removing Utils directory to better match namespaces

---
 .../{Utils => }/AttributeUtils.cs             |   0
 .../{Utils => }/Collections/IcdHashSet.cs     |   0
 .../{Utils => }/Collections/ScrollQueue.cs    |   0
 ICD.Common.Utils/{Utils => }/CrestronUtils.cs |   0
 ICD.Common.Utils/{Utils => }/EnumUtils.cs     |   0
 .../Extensions/CollectionExtensions.cs        |   0
 .../Extensions/DateTimeExtensions.cs          |   0
 .../Extensions/DictionaryExtensions.cs        |   0
 .../{Utils => }/Extensions/EnumExtensions.cs  |   0
 .../Extensions/EnumerableExtensions.cs        |   0
 .../Extensions/EventHandlerExtensions.cs      |   0
 .../Extensions/HashSetExtensions.cs           |   0
 .../{Utils => }/Extensions/JsonExtensions.cs  |   0
 .../{Utils => }/Extensions/QueueExtensions.cs |   0
 .../Extensions/ReflectionExtensions.cs        |   0
 .../Extensions/StringBuilderExtensions.cs     |   0
 .../Extensions/StringExtensions.cs            |   0
 .../Extensions/TimeSpanExtensions.cs          |   0
 .../{Utils => }/Extensions/TypeExtensions.cs  |   0
 .../ICD.Common.Utils_SimplSharp.csproj        | 130 +++++++++---------
 .../{Utils => }/IO/IcdDirectory.cs            |   0
 .../{Utils => }/IO/IcdEncodingStringWriter.cs |   0
 ICD.Common.Utils/{Utils => }/IO/IcdFile.cs    |   0
 .../{Utils => }/IO/IcdFileStream.cs           |   0
 .../{Utils => }/IO/IcdMemoryStream.cs         |   0
 ICD.Common.Utils/{Utils => }/IO/IcdPath.cs    |   0
 ICD.Common.Utils/{Utils => }/IO/IcdStream.cs  |   0
 .../{Utils => }/IO/IcdStreamReader.cs         |   0
 .../{Utils => }/IO/IcdStringReader.cs         |   0
 .../{Utils => }/IO/IcdStringWriter.cs         |   0
 .../{Utils => }/IO/IcdTextReader.cs           |   0
 .../{Utils => }/IO/IcdTextWriter.cs           |   0
 .../{Utils => }/IStateDisposable.cs           |   0
 ICD.Common.Utils/{Utils => }/IcdConsole.cs    |   0
 .../{Utils => }/IcdEnvironment.SimplSharp.cs  |   0
 .../{Utils => }/IcdEnvironment.Standard.cs    |   0
 .../{Utils => }/IcdEnvironment.cs             |   0
 ICD.Common.Utils/{Utils => }/IcdErrorLog.cs   |   0
 ICD.Common.Utils/{Utils => }/IcdZip.cs        |   0
 .../Json/AbstractGenericJsonConverter.cs      |   0
 .../{Utils => }/Json/JsonItemWrapper.cs       |   0
 .../{Utils => }/Json/JsonUtils.cs             |   0
 ICD.Common.Utils/{Utils => }/MathUtils.cs     |   0
 ICD.Common.Utils/{Utils => }/PathUtils.cs     |   0
 ICD.Common.Utils/{Utils => }/PrettyPrint.cs   |   0
 ICD.Common.Utils/{Utils => }/ProgramUtils.cs  |   0
 .../{Utils => }/ReflectionUtils.cs            |   0
 .../SafeCriticalSection.SimplSharp.cs         |   0
 .../SafeCriticalSection.Standard.cs           |   0
 .../{Utils => }/SafeCriticalSection.cs        |   0
 ICD.Common.Utils/{Utils => }/SafeMutex.cs     |   0
 ICD.Common.Utils/{Utils => }/StringUtils.cs   |   0
 ICD.Common.Utils/{Utils => }/TableBuilder.cs  |   0
 .../{Utils => }/Timers/IcdStopwatch.cs        |   0
 .../{Utils => }/Timers/IcdTimer.cs            |   0
 .../{Utils => }/Timers/Repeater.cs            |   0
 .../{Utils => }/Timers/SafeTimer.cs           |   0
 ICD.Common.Utils/{Utils => }/TryUtils.cs      |   0
 .../{Utils => }/Xml/IcdXmlAttribute.cs        |   0
 .../{Utils => }/Xml/IcdXmlConvert.cs          |   0
 .../{Utils => }/Xml/IcdXmlDocument.cs         |   0
 .../{Utils => }/Xml/IcdXmlException.cs        |   0
 .../{Utils => }/Xml/IcdXmlReader.cs           |   0
 .../Xml/IcdXmlTextWriter.SimplSharp.cs        |   0
 .../Xml/IcdXmlTextWriter.Standard.cs          |   0
 .../{Utils => }/Xml/IcdXmlTextWriter.cs       |   0
 .../{Utils => }/Xml/XmlReaderExtensions.cs    |   0
 ICD.Common.Utils/{Utils => }/Xml/XmlUtils.cs  |   0
 68 files changed, 65 insertions(+), 65 deletions(-)
 rename ICD.Common.Utils/{Utils => }/AttributeUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Collections/IcdHashSet.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Collections/ScrollQueue.cs (100%)
 rename ICD.Common.Utils/{Utils => }/CrestronUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/EnumUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/CollectionExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/DateTimeExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/DictionaryExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/EnumExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/EnumerableExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/EventHandlerExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/HashSetExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/JsonExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/QueueExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/ReflectionExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/StringBuilderExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/StringExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/TimeSpanExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Extensions/TypeExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdDirectory.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdEncodingStringWriter.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdFile.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdFileStream.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdMemoryStream.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdPath.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdStream.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdStreamReader.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdStringReader.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdStringWriter.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdTextReader.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IO/IcdTextWriter.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IStateDisposable.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdConsole.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdEnvironment.SimplSharp.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdEnvironment.Standard.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdEnvironment.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdErrorLog.cs (100%)
 rename ICD.Common.Utils/{Utils => }/IcdZip.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Json/AbstractGenericJsonConverter.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Json/JsonItemWrapper.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Json/JsonUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/MathUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/PathUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/PrettyPrint.cs (100%)
 rename ICD.Common.Utils/{Utils => }/ProgramUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/ReflectionUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/SafeCriticalSection.SimplSharp.cs (100%)
 rename ICD.Common.Utils/{Utils => }/SafeCriticalSection.Standard.cs (100%)
 rename ICD.Common.Utils/{Utils => }/SafeCriticalSection.cs (100%)
 rename ICD.Common.Utils/{Utils => }/SafeMutex.cs (100%)
 rename ICD.Common.Utils/{Utils => }/StringUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/TableBuilder.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Timers/IcdStopwatch.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Timers/IcdTimer.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Timers/Repeater.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Timers/SafeTimer.cs (100%)
 rename ICD.Common.Utils/{Utils => }/TryUtils.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlAttribute.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlConvert.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlDocument.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlException.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlReader.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlTextWriter.SimplSharp.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlTextWriter.Standard.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/IcdXmlTextWriter.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/XmlReaderExtensions.cs (100%)
 rename ICD.Common.Utils/{Utils => }/Xml/XmlUtils.cs (100%)

diff --git a/ICD.Common.Utils/Utils/AttributeUtils.cs b/ICD.Common.Utils/AttributeUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/AttributeUtils.cs
rename to ICD.Common.Utils/AttributeUtils.cs
diff --git a/ICD.Common.Utils/Utils/Collections/IcdHashSet.cs b/ICD.Common.Utils/Collections/IcdHashSet.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Collections/IcdHashSet.cs
rename to ICD.Common.Utils/Collections/IcdHashSet.cs
diff --git a/ICD.Common.Utils/Utils/Collections/ScrollQueue.cs b/ICD.Common.Utils/Collections/ScrollQueue.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Collections/ScrollQueue.cs
rename to ICD.Common.Utils/Collections/ScrollQueue.cs
diff --git a/ICD.Common.Utils/Utils/CrestronUtils.cs b/ICD.Common.Utils/CrestronUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/CrestronUtils.cs
rename to ICD.Common.Utils/CrestronUtils.cs
diff --git a/ICD.Common.Utils/Utils/EnumUtils.cs b/ICD.Common.Utils/EnumUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/EnumUtils.cs
rename to ICD.Common.Utils/EnumUtils.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/CollectionExtensions.cs b/ICD.Common.Utils/Extensions/CollectionExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/CollectionExtensions.cs
rename to ICD.Common.Utils/Extensions/CollectionExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/DateTimeExtensions.cs b/ICD.Common.Utils/Extensions/DateTimeExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/DateTimeExtensions.cs
rename to ICD.Common.Utils/Extensions/DateTimeExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/DictionaryExtensions.cs b/ICD.Common.Utils/Extensions/DictionaryExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/DictionaryExtensions.cs
rename to ICD.Common.Utils/Extensions/DictionaryExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/EnumExtensions.cs b/ICD.Common.Utils/Extensions/EnumExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/EnumExtensions.cs
rename to ICD.Common.Utils/Extensions/EnumExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/EnumerableExtensions.cs b/ICD.Common.Utils/Extensions/EnumerableExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/EnumerableExtensions.cs
rename to ICD.Common.Utils/Extensions/EnumerableExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/EventHandlerExtensions.cs b/ICD.Common.Utils/Extensions/EventHandlerExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/EventHandlerExtensions.cs
rename to ICD.Common.Utils/Extensions/EventHandlerExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/HashSetExtensions.cs b/ICD.Common.Utils/Extensions/HashSetExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/HashSetExtensions.cs
rename to ICD.Common.Utils/Extensions/HashSetExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/JsonExtensions.cs b/ICD.Common.Utils/Extensions/JsonExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/JsonExtensions.cs
rename to ICD.Common.Utils/Extensions/JsonExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/QueueExtensions.cs b/ICD.Common.Utils/Extensions/QueueExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/QueueExtensions.cs
rename to ICD.Common.Utils/Extensions/QueueExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/ReflectionExtensions.cs b/ICD.Common.Utils/Extensions/ReflectionExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/ReflectionExtensions.cs
rename to ICD.Common.Utils/Extensions/ReflectionExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/StringBuilderExtensions.cs b/ICD.Common.Utils/Extensions/StringBuilderExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/StringBuilderExtensions.cs
rename to ICD.Common.Utils/Extensions/StringBuilderExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/StringExtensions.cs b/ICD.Common.Utils/Extensions/StringExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/StringExtensions.cs
rename to ICD.Common.Utils/Extensions/StringExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/TimeSpanExtensions.cs b/ICD.Common.Utils/Extensions/TimeSpanExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/TimeSpanExtensions.cs
rename to ICD.Common.Utils/Extensions/TimeSpanExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Extensions/TypeExtensions.cs b/ICD.Common.Utils/Extensions/TypeExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Extensions/TypeExtensions.cs
rename to ICD.Common.Utils/Extensions/TypeExtensions.cs
diff --git a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
index 53d5f5e..d2ae64b 100644
--- a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
+++ b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
@@ -90,73 +90,73 @@
     <Compile Include="Services\Logging\LogItem.cs" />
     <Compile Include="Services\Logging\LogItemEventArgs.cs" />
     <Compile Include="Services\Logging\SeverityEventArgs.cs" />
-    <Compile Include="Utils\AttributeUtils.cs" />
+    <Compile Include="AttributeUtils.cs" />
     <Compile Include="Services\ServiceNotFoundException.cs" />
     <Compile Include="Services\ServiceProvider.cs" />
-    <Compile Include="Utils\Collections\IcdHashSet.cs" />
-    <Compile Include="Utils\Collections\ScrollQueue.cs" />
-    <Compile Include="Utils\CrestronUtils.cs" />
-    <Compile Include="Utils\Extensions\DateTimeExtensions.cs" />
-    <Compile Include="Utils\Extensions\TypeExtensions.cs" />
-    <Compile Include="Utils\IcdConsole.cs" />
-    <Compile Include="Utils\IcdEnvironment.cs" />
-    <Compile Include="Utils\IcdEnvironment.SimplSharp.cs" />
-    <Compile Include="Utils\IcdEnvironment.Standard.cs" />
-    <Compile Include="Utils\IcdZip.cs" />
-    <Compile Include="Utils\IO\IcdDirectory.cs" />
-    <Compile Include="Utils\EnumUtils.cs" />
-    <Compile Include="Utils\Extensions\CollectionExtensions.cs" />
-    <Compile Include="Utils\Extensions\DictionaryExtensions.cs" />
-    <Compile Include="Utils\Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Utils\Extensions\EnumExtensions.cs" />
-    <Compile Include="Utils\Extensions\EventHandlerExtensions.cs" />
-    <Compile Include="Utils\Extensions\JsonExtensions.cs" />
-    <Compile Include="Utils\Extensions\QueueExtensions.cs" />
-    <Compile Include="Utils\Extensions\ReflectionExtensions.cs" />
-    <Compile Include="Utils\Extensions\StringBuilderExtensions.cs" />
-    <Compile Include="Utils\Extensions\StringExtensions.cs" />
-    <Compile Include="Utils\Extensions\TimeSpanExtensions.cs" />
-    <Compile Include="Utils\IcdErrorLog.cs" />
-    <Compile Include="Utils\IO\IcdEncodingStringWriter.cs" />
-    <Compile Include="Utils\IO\IcdFile.cs" />
-    <Compile Include="Utils\IO\IcdFileStream.cs" />
-    <Compile Include="Utils\IO\IcdMemoryStream.cs" />
-    <Compile Include="Utils\IO\IcdPath.cs" />
-    <Compile Include="Utils\IO\IcdStream.cs" />
-    <Compile Include="Utils\IO\IcdStreamReader.cs" />
-    <Compile Include="Utils\IO\IcdStringReader.cs" />
-    <Compile Include="Utils\IO\IcdStringWriter.cs" />
-    <Compile Include="Utils\IO\IcdTextReader.cs" />
-    <Compile Include="Utils\IO\IcdTextWriter.cs" />
-    <Compile Include="Utils\IStateDisposable.cs" />
-    <Compile Include="Utils\Json\AbstractGenericJsonConverter.cs" />
-    <Compile Include="Utils\Json\JsonItemWrapper.cs" />
-    <Compile Include="Utils\Json\JsonUtils.cs" />
-    <Compile Include="Utils\MathUtils.cs" />
-    <Compile Include="Utils\PathUtils.cs" />
-    <Compile Include="Utils\PrettyPrint.cs" />
-    <Compile Include="Utils\ProgramUtils.cs" />
-    <Compile Include="Utils\ReflectionUtils.cs" />
-    <Compile Include="Utils\SafeCriticalSection.cs" />
-    <Compile Include="Utils\SafeCriticalSection.SimplSharp.cs" />
-    <Compile Include="Utils\SafeCriticalSection.Standard.cs" />
-    <Compile Include="Utils\SafeMutex.cs" />
-    <Compile Include="Utils\StringUtils.cs" />
-    <Compile Include="Utils\TableBuilder.cs" />
-    <Compile Include="Utils\Timers\IcdStopwatch.cs" />
-    <Compile Include="Utils\Timers\IcdTimer.cs" />
-    <Compile Include="Utils\Timers\Repeater.cs" />
-    <Compile Include="Utils\Timers\SafeTimer.cs" />
-    <Compile Include="Utils\TryUtils.cs" />
-    <Compile Include="Utils\Xml\IcdXmlConvert.cs" />
-    <Compile Include="Utils\Xml\IcdXmlDocument.cs" />
-    <Compile Include="Utils\Xml\IcdXmlException.cs" />
-    <Compile Include="Utils\Xml\IcdXmlReader.cs" />
-    <Compile Include="Utils\Xml\IcdXmlTextWriter.cs" />
-    <Compile Include="Utils\Xml\IcdXmlTextWriter.SimplSharp.cs" />
-    <Compile Include="Utils\Xml\IcdXmlAttribute.cs" />
-    <Compile Include="Utils\Xml\XmlReaderExtensions.cs" />
-    <Compile Include="Utils\Xml\XmlUtils.cs" />
+    <Compile Include="Collections\IcdHashSet.cs" />
+    <Compile Include="Collections\ScrollQueue.cs" />
+    <Compile Include="CrestronUtils.cs" />
+    <Compile Include="Extensions\DateTimeExtensions.cs" />
+    <Compile Include="Extensions\TypeExtensions.cs" />
+    <Compile Include="IcdConsole.cs" />
+    <Compile Include="IcdEnvironment.cs" />
+    <Compile Include="IcdEnvironment.SimplSharp.cs" />
+    <Compile Include="IcdEnvironment.Standard.cs" />
+    <Compile Include="IcdZip.cs" />
+    <Compile Include="IO\IcdDirectory.cs" />
+    <Compile Include="EnumUtils.cs" />
+    <Compile Include="Extensions\CollectionExtensions.cs" />
+    <Compile Include="Extensions\DictionaryExtensions.cs" />
+    <Compile Include="Extensions\EnumerableExtensions.cs" />
+    <Compile Include="Extensions\EnumExtensions.cs" />
+    <Compile Include="Extensions\EventHandlerExtensions.cs" />
+    <Compile Include="Extensions\JsonExtensions.cs" />
+    <Compile Include="Extensions\QueueExtensions.cs" />
+    <Compile Include="Extensions\ReflectionExtensions.cs" />
+    <Compile Include="Extensions\StringBuilderExtensions.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="Extensions\TimeSpanExtensions.cs" />
+    <Compile Include="IcdErrorLog.cs" />
+    <Compile Include="IO\IcdEncodingStringWriter.cs" />
+    <Compile Include="IO\IcdFile.cs" />
+    <Compile Include="IO\IcdFileStream.cs" />
+    <Compile Include="IO\IcdMemoryStream.cs" />
+    <Compile Include="IO\IcdPath.cs" />
+    <Compile Include="IO\IcdStream.cs" />
+    <Compile Include="IO\IcdStreamReader.cs" />
+    <Compile Include="IO\IcdStringReader.cs" />
+    <Compile Include="IO\IcdStringWriter.cs" />
+    <Compile Include="IO\IcdTextReader.cs" />
+    <Compile Include="IO\IcdTextWriter.cs" />
+    <Compile Include="IStateDisposable.cs" />
+    <Compile Include="Json\AbstractGenericJsonConverter.cs" />
+    <Compile Include="Json\JsonItemWrapper.cs" />
+    <Compile Include="Json\JsonUtils.cs" />
+    <Compile Include="MathUtils.cs" />
+    <Compile Include="PathUtils.cs" />
+    <Compile Include="PrettyPrint.cs" />
+    <Compile Include="ProgramUtils.cs" />
+    <Compile Include="ReflectionUtils.cs" />
+    <Compile Include="SafeCriticalSection.cs" />
+    <Compile Include="SafeCriticalSection.SimplSharp.cs" />
+    <Compile Include="SafeCriticalSection.Standard.cs" />
+    <Compile Include="SafeMutex.cs" />
+    <Compile Include="StringUtils.cs" />
+    <Compile Include="TableBuilder.cs" />
+    <Compile Include="Timers\IcdStopwatch.cs" />
+    <Compile Include="Timers\IcdTimer.cs" />
+    <Compile Include="Timers\Repeater.cs" />
+    <Compile Include="Timers\SafeTimer.cs" />
+    <Compile Include="TryUtils.cs" />
+    <Compile Include="Xml\IcdXmlConvert.cs" />
+    <Compile Include="Xml\IcdXmlDocument.cs" />
+    <Compile Include="Xml\IcdXmlException.cs" />
+    <Compile Include="Xml\IcdXmlReader.cs" />
+    <Compile Include="Xml\IcdXmlTextWriter.cs" />
+    <Compile Include="Xml\IcdXmlTextWriter.SimplSharp.cs" />
+    <Compile Include="Xml\IcdXmlAttribute.cs" />
+    <Compile Include="Xml\XmlReaderExtensions.cs" />
+    <Compile Include="Xml\XmlUtils.cs" />
     <None Include="Properties\ControlSystem.cfg" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
diff --git a/ICD.Common.Utils/Utils/IO/IcdDirectory.cs b/ICD.Common.Utils/IO/IcdDirectory.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdDirectory.cs
rename to ICD.Common.Utils/IO/IcdDirectory.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdEncodingStringWriter.cs b/ICD.Common.Utils/IO/IcdEncodingStringWriter.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdEncodingStringWriter.cs
rename to ICD.Common.Utils/IO/IcdEncodingStringWriter.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdFile.cs b/ICD.Common.Utils/IO/IcdFile.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdFile.cs
rename to ICD.Common.Utils/IO/IcdFile.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdFileStream.cs b/ICD.Common.Utils/IO/IcdFileStream.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdFileStream.cs
rename to ICD.Common.Utils/IO/IcdFileStream.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdMemoryStream.cs b/ICD.Common.Utils/IO/IcdMemoryStream.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdMemoryStream.cs
rename to ICD.Common.Utils/IO/IcdMemoryStream.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdPath.cs b/ICD.Common.Utils/IO/IcdPath.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdPath.cs
rename to ICD.Common.Utils/IO/IcdPath.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdStream.cs b/ICD.Common.Utils/IO/IcdStream.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdStream.cs
rename to ICD.Common.Utils/IO/IcdStream.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdStreamReader.cs b/ICD.Common.Utils/IO/IcdStreamReader.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdStreamReader.cs
rename to ICD.Common.Utils/IO/IcdStreamReader.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdStringReader.cs b/ICD.Common.Utils/IO/IcdStringReader.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdStringReader.cs
rename to ICD.Common.Utils/IO/IcdStringReader.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdStringWriter.cs b/ICD.Common.Utils/IO/IcdStringWriter.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdStringWriter.cs
rename to ICD.Common.Utils/IO/IcdStringWriter.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdTextReader.cs b/ICD.Common.Utils/IO/IcdTextReader.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdTextReader.cs
rename to ICD.Common.Utils/IO/IcdTextReader.cs
diff --git a/ICD.Common.Utils/Utils/IO/IcdTextWriter.cs b/ICD.Common.Utils/IO/IcdTextWriter.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IO/IcdTextWriter.cs
rename to ICD.Common.Utils/IO/IcdTextWriter.cs
diff --git a/ICD.Common.Utils/Utils/IStateDisposable.cs b/ICD.Common.Utils/IStateDisposable.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IStateDisposable.cs
rename to ICD.Common.Utils/IStateDisposable.cs
diff --git a/ICD.Common.Utils/Utils/IcdConsole.cs b/ICD.Common.Utils/IcdConsole.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdConsole.cs
rename to ICD.Common.Utils/IcdConsole.cs
diff --git a/ICD.Common.Utils/Utils/IcdEnvironment.SimplSharp.cs b/ICD.Common.Utils/IcdEnvironment.SimplSharp.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdEnvironment.SimplSharp.cs
rename to ICD.Common.Utils/IcdEnvironment.SimplSharp.cs
diff --git a/ICD.Common.Utils/Utils/IcdEnvironment.Standard.cs b/ICD.Common.Utils/IcdEnvironment.Standard.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdEnvironment.Standard.cs
rename to ICD.Common.Utils/IcdEnvironment.Standard.cs
diff --git a/ICD.Common.Utils/Utils/IcdEnvironment.cs b/ICD.Common.Utils/IcdEnvironment.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdEnvironment.cs
rename to ICD.Common.Utils/IcdEnvironment.cs
diff --git a/ICD.Common.Utils/Utils/IcdErrorLog.cs b/ICD.Common.Utils/IcdErrorLog.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdErrorLog.cs
rename to ICD.Common.Utils/IcdErrorLog.cs
diff --git a/ICD.Common.Utils/Utils/IcdZip.cs b/ICD.Common.Utils/IcdZip.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/IcdZip.cs
rename to ICD.Common.Utils/IcdZip.cs
diff --git a/ICD.Common.Utils/Utils/Json/AbstractGenericJsonConverter.cs b/ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Json/AbstractGenericJsonConverter.cs
rename to ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs
diff --git a/ICD.Common.Utils/Utils/Json/JsonItemWrapper.cs b/ICD.Common.Utils/Json/JsonItemWrapper.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Json/JsonItemWrapper.cs
rename to ICD.Common.Utils/Json/JsonItemWrapper.cs
diff --git a/ICD.Common.Utils/Utils/Json/JsonUtils.cs b/ICD.Common.Utils/Json/JsonUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Json/JsonUtils.cs
rename to ICD.Common.Utils/Json/JsonUtils.cs
diff --git a/ICD.Common.Utils/Utils/MathUtils.cs b/ICD.Common.Utils/MathUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/MathUtils.cs
rename to ICD.Common.Utils/MathUtils.cs
diff --git a/ICD.Common.Utils/Utils/PathUtils.cs b/ICD.Common.Utils/PathUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/PathUtils.cs
rename to ICD.Common.Utils/PathUtils.cs
diff --git a/ICD.Common.Utils/Utils/PrettyPrint.cs b/ICD.Common.Utils/PrettyPrint.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/PrettyPrint.cs
rename to ICD.Common.Utils/PrettyPrint.cs
diff --git a/ICD.Common.Utils/Utils/ProgramUtils.cs b/ICD.Common.Utils/ProgramUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/ProgramUtils.cs
rename to ICD.Common.Utils/ProgramUtils.cs
diff --git a/ICD.Common.Utils/Utils/ReflectionUtils.cs b/ICD.Common.Utils/ReflectionUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/ReflectionUtils.cs
rename to ICD.Common.Utils/ReflectionUtils.cs
diff --git a/ICD.Common.Utils/Utils/SafeCriticalSection.SimplSharp.cs b/ICD.Common.Utils/SafeCriticalSection.SimplSharp.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/SafeCriticalSection.SimplSharp.cs
rename to ICD.Common.Utils/SafeCriticalSection.SimplSharp.cs
diff --git a/ICD.Common.Utils/Utils/SafeCriticalSection.Standard.cs b/ICD.Common.Utils/SafeCriticalSection.Standard.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/SafeCriticalSection.Standard.cs
rename to ICD.Common.Utils/SafeCriticalSection.Standard.cs
diff --git a/ICD.Common.Utils/Utils/SafeCriticalSection.cs b/ICD.Common.Utils/SafeCriticalSection.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/SafeCriticalSection.cs
rename to ICD.Common.Utils/SafeCriticalSection.cs
diff --git a/ICD.Common.Utils/Utils/SafeMutex.cs b/ICD.Common.Utils/SafeMutex.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/SafeMutex.cs
rename to ICD.Common.Utils/SafeMutex.cs
diff --git a/ICD.Common.Utils/Utils/StringUtils.cs b/ICD.Common.Utils/StringUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/StringUtils.cs
rename to ICD.Common.Utils/StringUtils.cs
diff --git a/ICD.Common.Utils/Utils/TableBuilder.cs b/ICD.Common.Utils/TableBuilder.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/TableBuilder.cs
rename to ICD.Common.Utils/TableBuilder.cs
diff --git a/ICD.Common.Utils/Utils/Timers/IcdStopwatch.cs b/ICD.Common.Utils/Timers/IcdStopwatch.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Timers/IcdStopwatch.cs
rename to ICD.Common.Utils/Timers/IcdStopwatch.cs
diff --git a/ICD.Common.Utils/Utils/Timers/IcdTimer.cs b/ICD.Common.Utils/Timers/IcdTimer.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Timers/IcdTimer.cs
rename to ICD.Common.Utils/Timers/IcdTimer.cs
diff --git a/ICD.Common.Utils/Utils/Timers/Repeater.cs b/ICD.Common.Utils/Timers/Repeater.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Timers/Repeater.cs
rename to ICD.Common.Utils/Timers/Repeater.cs
diff --git a/ICD.Common.Utils/Utils/Timers/SafeTimer.cs b/ICD.Common.Utils/Timers/SafeTimer.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Timers/SafeTimer.cs
rename to ICD.Common.Utils/Timers/SafeTimer.cs
diff --git a/ICD.Common.Utils/Utils/TryUtils.cs b/ICD.Common.Utils/TryUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/TryUtils.cs
rename to ICD.Common.Utils/TryUtils.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlAttribute.cs b/ICD.Common.Utils/Xml/IcdXmlAttribute.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlAttribute.cs
rename to ICD.Common.Utils/Xml/IcdXmlAttribute.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlConvert.cs b/ICD.Common.Utils/Xml/IcdXmlConvert.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlConvert.cs
rename to ICD.Common.Utils/Xml/IcdXmlConvert.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlDocument.cs b/ICD.Common.Utils/Xml/IcdXmlDocument.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlDocument.cs
rename to ICD.Common.Utils/Xml/IcdXmlDocument.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlException.cs b/ICD.Common.Utils/Xml/IcdXmlException.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlException.cs
rename to ICD.Common.Utils/Xml/IcdXmlException.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlReader.cs b/ICD.Common.Utils/Xml/IcdXmlReader.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlReader.cs
rename to ICD.Common.Utils/Xml/IcdXmlReader.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
rename to ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.Standard.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.Standard.cs
rename to ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs
diff --git a/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.cs
rename to ICD.Common.Utils/Xml/IcdXmlTextWriter.cs
diff --git a/ICD.Common.Utils/Utils/Xml/XmlReaderExtensions.cs b/ICD.Common.Utils/Xml/XmlReaderExtensions.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/XmlReaderExtensions.cs
rename to ICD.Common.Utils/Xml/XmlReaderExtensions.cs
diff --git a/ICD.Common.Utils/Utils/Xml/XmlUtils.cs b/ICD.Common.Utils/Xml/XmlUtils.cs
similarity index 100%
rename from ICD.Common.Utils/Utils/Xml/XmlUtils.cs
rename to ICD.Common.Utils/Xml/XmlUtils.cs