diff --git a/ICD.Common/Attributes/AbstractIcdAttribute.cs b/ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs
similarity index 100%
rename from ICD.Common/Attributes/AbstractIcdAttribute.cs
rename to ICD.Common.Utils/Attributes/AbstractIcdAttribute.cs
diff --git a/ICD.Common/Attributes/KrangPluginAttribute.cs b/ICD.Common.Utils/Attributes/KrangPluginAttribute.cs
similarity index 100%
rename from ICD.Common/Attributes/KrangPluginAttribute.cs
rename to ICD.Common.Utils/Attributes/KrangPluginAttribute.cs
diff --git a/ICD.Common/Attributes/Properties/SettingsProperty.cs b/ICD.Common.Utils/Attributes/Properties/SettingsProperty.cs
similarity index 100%
rename from ICD.Common/Attributes/Properties/SettingsProperty.cs
rename to ICD.Common.Utils/Attributes/Properties/SettingsProperty.cs
diff --git a/ICD.Common/Attributes/Rpc/RpcAttribute.cs b/ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs
similarity index 100%
rename from ICD.Common/Attributes/Rpc/RpcAttribute.cs
rename to ICD.Common.Utils/Attributes/Rpc/RpcAttribute.cs
diff --git a/ICD.Common/EventArguments/BoolEventArgs.cs b/ICD.Common.Utils/EventArguments/BoolEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/BoolEventArgs.cs
rename to ICD.Common.Utils/EventArguments/BoolEventArgs.cs
diff --git a/ICD.Common/EventArguments/CharEventArgs.cs b/ICD.Common.Utils/EventArguments/CharEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/CharEventArgs.cs
rename to ICD.Common.Utils/EventArguments/CharEventArgs.cs
diff --git a/ICD.Common/EventArguments/DateTimeEventArgs.cs b/ICD.Common.Utils/EventArguments/DateTimeEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/DateTimeEventArgs.cs
rename to ICD.Common.Utils/EventArguments/DateTimeEventArgs.cs
diff --git a/ICD.Common/EventArguments/FloatEventArgs.cs b/ICD.Common.Utils/EventArguments/FloatEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/FloatEventArgs.cs
rename to ICD.Common.Utils/EventArguments/FloatEventArgs.cs
diff --git a/ICD.Common/EventArguments/GenericEventArgs.cs b/ICD.Common.Utils/EventArguments/GenericEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/GenericEventArgs.cs
rename to ICD.Common.Utils/EventArguments/GenericEventArgs.cs
diff --git a/ICD.Common/EventArguments/IntEventArgs.cs b/ICD.Common.Utils/EventArguments/IntEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/IntEventArgs.cs
rename to ICD.Common.Utils/EventArguments/IntEventArgs.cs
diff --git a/ICD.Common/EventArguments/StringEventArgs.cs b/ICD.Common.Utils/EventArguments/StringEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/StringEventArgs.cs
rename to ICD.Common.Utils/EventArguments/StringEventArgs.cs
diff --git a/ICD.Common/EventArguments/TcpReceiveEventArgs.cs b/ICD.Common.Utils/EventArguments/TcpReceiveEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/TcpReceiveEventArgs.cs
rename to ICD.Common.Utils/EventArguments/TcpReceiveEventArgs.cs
diff --git a/ICD.Common/EventArguments/UShortEventArgs.cs b/ICD.Common.Utils/EventArguments/UShortEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/UShortEventArgs.cs
rename to ICD.Common.Utils/EventArguments/UShortEventArgs.cs
diff --git a/ICD.Common/EventArguments/XmlRecursionEventArgs.cs b/ICD.Common.Utils/EventArguments/XmlRecursionEventArgs.cs
similarity index 100%
rename from ICD.Common/EventArguments/XmlRecursionEventArgs.cs
rename to ICD.Common.Utils/EventArguments/XmlRecursionEventArgs.cs
diff --git a/ICD.Common/ICD.Common_NetStandard.csproj b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj
similarity index 68%
rename from ICD.Common/ICD.Common_NetStandard.csproj
rename to ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj
index c577dac..0f33e67 100644
--- a/ICD.Common/ICD.Common_NetStandard.csproj
+++ b/ICD.Common.Utils/ICD.Common.Utils_NetStandard.csproj
@@ -3,6 +3,17 @@
Library
netstandard1.6
+ ICD.Common.Utils
+ $(AssemblyName)
+ True
+ Chris Cameron, Jeff Thompson
+ Integrated Commercial Design
+ ICD.Common.Utils
+ ICD.Common.Utils
+ 2017 Integrated Commercial Design
+
+ https://cs-gogs.icdpf.net/Common/Utils
+ git
diff --git a/ICD.Common/ICD.Common_SimplSharp.csproj b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
similarity index 98%
rename from ICD.Common/ICD.Common_SimplSharp.csproj
rename to ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
index cec95b6..6a5c55e 100644
--- a/ICD.Common/ICD.Common_SimplSharp.csproj
+++ b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
@@ -7,8 +7,8 @@
{CB4055C6-D59E-479E-9C56-2C92335A7D9A}
Library
Properties
- ICD.Common
- ICD.Common
+ ICD.Common.Utils
+ ICD.Common.Utils
{0B4745B0-194B-4BB6-8E21-E9057CA92500};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
WindowsCE
E2BECB1F-8C8C-41ba-B736-9BE7D946A398
diff --git a/ICD.Common/ObfuscationSettings.cs b/ICD.Common.Utils/ObfuscationSettings.cs
similarity index 100%
rename from ICD.Common/ObfuscationSettings.cs
rename to ICD.Common.Utils/ObfuscationSettings.cs
diff --git a/ICD.Common/Properties/Annotations.cs b/ICD.Common.Utils/Properties/Annotations.cs
similarity index 100%
rename from ICD.Common/Properties/Annotations.cs
rename to ICD.Common.Utils/Properties/Annotations.cs
diff --git a/ICD.Common/Properties/AssemblyInfo.cs b/ICD.Common.Utils/Properties/AssemblyInfo.cs
similarity index 100%
rename from ICD.Common/Properties/AssemblyInfo.cs
rename to ICD.Common.Utils/Properties/AssemblyInfo.cs
diff --git a/ICD.Common/Properties/ControlSystem.cfg b/ICD.Common.Utils/Properties/ControlSystem.cfg
similarity index 100%
rename from ICD.Common/Properties/ControlSystem.cfg
rename to ICD.Common.Utils/Properties/ControlSystem.cfg
diff --git a/ICD.Common/Services/Logging/ILoggerService.cs b/ICD.Common.Utils/Services/Logging/ILoggerService.cs
similarity index 100%
rename from ICD.Common/Services/Logging/ILoggerService.cs
rename to ICD.Common.Utils/Services/Logging/ILoggerService.cs
diff --git a/ICD.Common/Services/Logging/LogItem.cs b/ICD.Common.Utils/Services/Logging/LogItem.cs
similarity index 100%
rename from ICD.Common/Services/Logging/LogItem.cs
rename to ICD.Common.Utils/Services/Logging/LogItem.cs
diff --git a/ICD.Common/Services/Logging/LogItemEventArgs.cs b/ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs
similarity index 100%
rename from ICD.Common/Services/Logging/LogItemEventArgs.cs
rename to ICD.Common.Utils/Services/Logging/LogItemEventArgs.cs
diff --git a/ICD.Common/Services/Logging/SeverityEventArgs.cs b/ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs
similarity index 100%
rename from ICD.Common/Services/Logging/SeverityEventArgs.cs
rename to ICD.Common.Utils/Services/Logging/SeverityEventArgs.cs
diff --git a/ICD.Common/Services/ServiceNotFoundException.cs b/ICD.Common.Utils/Services/ServiceNotFoundException.cs
similarity index 100%
rename from ICD.Common/Services/ServiceNotFoundException.cs
rename to ICD.Common.Utils/Services/ServiceNotFoundException.cs
diff --git a/ICD.Common/Services/ServiceProvider.cs b/ICD.Common.Utils/Services/ServiceProvider.cs
similarity index 100%
rename from ICD.Common/Services/ServiceProvider.cs
rename to ICD.Common.Utils/Services/ServiceProvider.cs
diff --git a/ICD.Common/Utils/AttributeUtils.cs b/ICD.Common.Utils/Utils/AttributeUtils.cs
similarity index 100%
rename from ICD.Common/Utils/AttributeUtils.cs
rename to ICD.Common.Utils/Utils/AttributeUtils.cs
diff --git a/ICD.Common/Utils/Collections/IcdHashSet.cs b/ICD.Common.Utils/Utils/Collections/IcdHashSet.cs
similarity index 100%
rename from ICD.Common/Utils/Collections/IcdHashSet.cs
rename to ICD.Common.Utils/Utils/Collections/IcdHashSet.cs
diff --git a/ICD.Common/Utils/Collections/ScrollQueue.cs b/ICD.Common.Utils/Utils/Collections/ScrollQueue.cs
similarity index 100%
rename from ICD.Common/Utils/Collections/ScrollQueue.cs
rename to ICD.Common.Utils/Utils/Collections/ScrollQueue.cs
diff --git a/ICD.Common/Utils/CrestronUtils.cs b/ICD.Common.Utils/Utils/CrestronUtils.cs
similarity index 100%
rename from ICD.Common/Utils/CrestronUtils.cs
rename to ICD.Common.Utils/Utils/CrestronUtils.cs
diff --git a/ICD.Common/Utils/EnumUtils.cs b/ICD.Common.Utils/Utils/EnumUtils.cs
similarity index 100%
rename from ICD.Common/Utils/EnumUtils.cs
rename to ICD.Common.Utils/Utils/EnumUtils.cs
diff --git a/ICD.Common/Utils/Extensions/CollectionExtensions.cs b/ICD.Common.Utils/Utils/Extensions/CollectionExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/CollectionExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/CollectionExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/DateTimeExtensions.cs b/ICD.Common.Utils/Utils/Extensions/DateTimeExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/DateTimeExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/DateTimeExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/DictionaryExtensions.cs b/ICD.Common.Utils/Utils/Extensions/DictionaryExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/DictionaryExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/DictionaryExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/EnumExtensions.cs b/ICD.Common.Utils/Utils/Extensions/EnumExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/EnumExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/EnumExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/EnumerableExtensions.cs b/ICD.Common.Utils/Utils/Extensions/EnumerableExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/EnumerableExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/EnumerableExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/EventHandlerExtensions.cs b/ICD.Common.Utils/Utils/Extensions/EventHandlerExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/EventHandlerExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/EventHandlerExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/HashSetExtensions.cs b/ICD.Common.Utils/Utils/Extensions/HashSetExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/HashSetExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/HashSetExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/JsonExtensions.cs b/ICD.Common.Utils/Utils/Extensions/JsonExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/JsonExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/JsonExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/QueueExtensions.cs b/ICD.Common.Utils/Utils/Extensions/QueueExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/QueueExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/QueueExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/ReflectionExtensions.cs b/ICD.Common.Utils/Utils/Extensions/ReflectionExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/ReflectionExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/ReflectionExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/StringBuilderExtensions.cs b/ICD.Common.Utils/Utils/Extensions/StringBuilderExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/StringBuilderExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/StringBuilderExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/StringExtensions.cs b/ICD.Common.Utils/Utils/Extensions/StringExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/StringExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/StringExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/TimeSpanExtensions.cs b/ICD.Common.Utils/Utils/Extensions/TimeSpanExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/TimeSpanExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/TimeSpanExtensions.cs
diff --git a/ICD.Common/Utils/Extensions/TypeExtensions.cs b/ICD.Common.Utils/Utils/Extensions/TypeExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Extensions/TypeExtensions.cs
rename to ICD.Common.Utils/Utils/Extensions/TypeExtensions.cs
diff --git a/ICD.Common/Utils/IO/IcdDirectory.cs b/ICD.Common.Utils/Utils/IO/IcdDirectory.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdDirectory.cs
rename to ICD.Common.Utils/Utils/IO/IcdDirectory.cs
diff --git a/ICD.Common/Utils/IO/IcdEncodingStringWriter.cs b/ICD.Common.Utils/Utils/IO/IcdEncodingStringWriter.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdEncodingStringWriter.cs
rename to ICD.Common.Utils/Utils/IO/IcdEncodingStringWriter.cs
diff --git a/ICD.Common/Utils/IO/IcdFile.cs b/ICD.Common.Utils/Utils/IO/IcdFile.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdFile.cs
rename to ICD.Common.Utils/Utils/IO/IcdFile.cs
diff --git a/ICD.Common/Utils/IO/IcdFileStream.cs b/ICD.Common.Utils/Utils/IO/IcdFileStream.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdFileStream.cs
rename to ICD.Common.Utils/Utils/IO/IcdFileStream.cs
diff --git a/ICD.Common/Utils/IO/IcdMemoryStream.cs b/ICD.Common.Utils/Utils/IO/IcdMemoryStream.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdMemoryStream.cs
rename to ICD.Common.Utils/Utils/IO/IcdMemoryStream.cs
diff --git a/ICD.Common/Utils/IO/IcdPath.cs b/ICD.Common.Utils/Utils/IO/IcdPath.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdPath.cs
rename to ICD.Common.Utils/Utils/IO/IcdPath.cs
diff --git a/ICD.Common/Utils/IO/IcdStream.cs b/ICD.Common.Utils/Utils/IO/IcdStream.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdStream.cs
rename to ICD.Common.Utils/Utils/IO/IcdStream.cs
diff --git a/ICD.Common/Utils/IO/IcdStreamReader.cs b/ICD.Common.Utils/Utils/IO/IcdStreamReader.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdStreamReader.cs
rename to ICD.Common.Utils/Utils/IO/IcdStreamReader.cs
diff --git a/ICD.Common/Utils/IO/IcdStringReader.cs b/ICD.Common.Utils/Utils/IO/IcdStringReader.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdStringReader.cs
rename to ICD.Common.Utils/Utils/IO/IcdStringReader.cs
diff --git a/ICD.Common/Utils/IO/IcdStringWriter.cs b/ICD.Common.Utils/Utils/IO/IcdStringWriter.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdStringWriter.cs
rename to ICD.Common.Utils/Utils/IO/IcdStringWriter.cs
diff --git a/ICD.Common/Utils/IO/IcdTextReader.cs b/ICD.Common.Utils/Utils/IO/IcdTextReader.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdTextReader.cs
rename to ICD.Common.Utils/Utils/IO/IcdTextReader.cs
diff --git a/ICD.Common/Utils/IO/IcdTextWriter.cs b/ICD.Common.Utils/Utils/IO/IcdTextWriter.cs
similarity index 100%
rename from ICD.Common/Utils/IO/IcdTextWriter.cs
rename to ICD.Common.Utils/Utils/IO/IcdTextWriter.cs
diff --git a/ICD.Common/Utils/IStateDisposable.cs b/ICD.Common.Utils/Utils/IStateDisposable.cs
similarity index 100%
rename from ICD.Common/Utils/IStateDisposable.cs
rename to ICD.Common.Utils/Utils/IStateDisposable.cs
diff --git a/ICD.Common/Utils/IcdConsole.cs b/ICD.Common.Utils/Utils/IcdConsole.cs
similarity index 100%
rename from ICD.Common/Utils/IcdConsole.cs
rename to ICD.Common.Utils/Utils/IcdConsole.cs
diff --git a/ICD.Common/Utils/IcdEnvironment.SimplSharp.cs b/ICD.Common.Utils/Utils/IcdEnvironment.SimplSharp.cs
similarity index 100%
rename from ICD.Common/Utils/IcdEnvironment.SimplSharp.cs
rename to ICD.Common.Utils/Utils/IcdEnvironment.SimplSharp.cs
diff --git a/ICD.Common/Utils/IcdEnvironment.Standard.cs b/ICD.Common.Utils/Utils/IcdEnvironment.Standard.cs
similarity index 100%
rename from ICD.Common/Utils/IcdEnvironment.Standard.cs
rename to ICD.Common.Utils/Utils/IcdEnvironment.Standard.cs
diff --git a/ICD.Common/Utils/IcdEnvironment.cs b/ICD.Common.Utils/Utils/IcdEnvironment.cs
similarity index 100%
rename from ICD.Common/Utils/IcdEnvironment.cs
rename to ICD.Common.Utils/Utils/IcdEnvironment.cs
diff --git a/ICD.Common/Utils/IcdErrorLog.cs b/ICD.Common.Utils/Utils/IcdErrorLog.cs
similarity index 100%
rename from ICD.Common/Utils/IcdErrorLog.cs
rename to ICD.Common.Utils/Utils/IcdErrorLog.cs
diff --git a/ICD.Common/Utils/IcdZip.cs b/ICD.Common.Utils/Utils/IcdZip.cs
similarity index 100%
rename from ICD.Common/Utils/IcdZip.cs
rename to ICD.Common.Utils/Utils/IcdZip.cs
diff --git a/ICD.Common/Utils/Json/AbstractGenericJsonConverter.cs b/ICD.Common.Utils/Utils/Json/AbstractGenericJsonConverter.cs
similarity index 100%
rename from ICD.Common/Utils/Json/AbstractGenericJsonConverter.cs
rename to ICD.Common.Utils/Utils/Json/AbstractGenericJsonConverter.cs
diff --git a/ICD.Common/Utils/Json/JsonItemWrapper.cs b/ICD.Common.Utils/Utils/Json/JsonItemWrapper.cs
similarity index 100%
rename from ICD.Common/Utils/Json/JsonItemWrapper.cs
rename to ICD.Common.Utils/Utils/Json/JsonItemWrapper.cs
diff --git a/ICD.Common/Utils/Json/JsonUtils.cs b/ICD.Common.Utils/Utils/Json/JsonUtils.cs
similarity index 100%
rename from ICD.Common/Utils/Json/JsonUtils.cs
rename to ICD.Common.Utils/Utils/Json/JsonUtils.cs
diff --git a/ICD.Common/Utils/MathUtils.cs b/ICD.Common.Utils/Utils/MathUtils.cs
similarity index 100%
rename from ICD.Common/Utils/MathUtils.cs
rename to ICD.Common.Utils/Utils/MathUtils.cs
diff --git a/ICD.Common/Utils/PathUtils.cs b/ICD.Common.Utils/Utils/PathUtils.cs
similarity index 100%
rename from ICD.Common/Utils/PathUtils.cs
rename to ICD.Common.Utils/Utils/PathUtils.cs
diff --git a/ICD.Common/Utils/PrettyPrint.cs b/ICD.Common.Utils/Utils/PrettyPrint.cs
similarity index 100%
rename from ICD.Common/Utils/PrettyPrint.cs
rename to ICD.Common.Utils/Utils/PrettyPrint.cs
diff --git a/ICD.Common/Utils/ProgramUtils.cs b/ICD.Common.Utils/Utils/ProgramUtils.cs
similarity index 100%
rename from ICD.Common/Utils/ProgramUtils.cs
rename to ICD.Common.Utils/Utils/ProgramUtils.cs
diff --git a/ICD.Common/Utils/ReflectionUtils.cs b/ICD.Common.Utils/Utils/ReflectionUtils.cs
similarity index 100%
rename from ICD.Common/Utils/ReflectionUtils.cs
rename to ICD.Common.Utils/Utils/ReflectionUtils.cs
diff --git a/ICD.Common/Utils/SafeCriticalSection.SimplSharp.cs b/ICD.Common.Utils/Utils/SafeCriticalSection.SimplSharp.cs
similarity index 100%
rename from ICD.Common/Utils/SafeCriticalSection.SimplSharp.cs
rename to ICD.Common.Utils/Utils/SafeCriticalSection.SimplSharp.cs
diff --git a/ICD.Common/Utils/SafeCriticalSection.Standard.cs b/ICD.Common.Utils/Utils/SafeCriticalSection.Standard.cs
similarity index 100%
rename from ICD.Common/Utils/SafeCriticalSection.Standard.cs
rename to ICD.Common.Utils/Utils/SafeCriticalSection.Standard.cs
diff --git a/ICD.Common/Utils/SafeCriticalSection.cs b/ICD.Common.Utils/Utils/SafeCriticalSection.cs
similarity index 100%
rename from ICD.Common/Utils/SafeCriticalSection.cs
rename to ICD.Common.Utils/Utils/SafeCriticalSection.cs
diff --git a/ICD.Common/Utils/SafeMutex.cs b/ICD.Common.Utils/Utils/SafeMutex.cs
similarity index 100%
rename from ICD.Common/Utils/SafeMutex.cs
rename to ICD.Common.Utils/Utils/SafeMutex.cs
diff --git a/ICD.Common/Utils/StringUtils.cs b/ICD.Common.Utils/Utils/StringUtils.cs
similarity index 100%
rename from ICD.Common/Utils/StringUtils.cs
rename to ICD.Common.Utils/Utils/StringUtils.cs
diff --git a/ICD.Common/Utils/TableBuilder.cs b/ICD.Common.Utils/Utils/TableBuilder.cs
similarity index 100%
rename from ICD.Common/Utils/TableBuilder.cs
rename to ICD.Common.Utils/Utils/TableBuilder.cs
diff --git a/ICD.Common/Utils/Timers/IcdStopwatch.cs b/ICD.Common.Utils/Utils/Timers/IcdStopwatch.cs
similarity index 100%
rename from ICD.Common/Utils/Timers/IcdStopwatch.cs
rename to ICD.Common.Utils/Utils/Timers/IcdStopwatch.cs
diff --git a/ICD.Common/Utils/Timers/IcdTimer.cs b/ICD.Common.Utils/Utils/Timers/IcdTimer.cs
similarity index 100%
rename from ICD.Common/Utils/Timers/IcdTimer.cs
rename to ICD.Common.Utils/Utils/Timers/IcdTimer.cs
diff --git a/ICD.Common/Utils/Timers/Repeater.cs b/ICD.Common.Utils/Utils/Timers/Repeater.cs
similarity index 100%
rename from ICD.Common/Utils/Timers/Repeater.cs
rename to ICD.Common.Utils/Utils/Timers/Repeater.cs
diff --git a/ICD.Common/Utils/Timers/SafeTimer.cs b/ICD.Common.Utils/Utils/Timers/SafeTimer.cs
similarity index 100%
rename from ICD.Common/Utils/Timers/SafeTimer.cs
rename to ICD.Common.Utils/Utils/Timers/SafeTimer.cs
diff --git a/ICD.Common/Utils/TryUtils.cs b/ICD.Common.Utils/Utils/TryUtils.cs
similarity index 100%
rename from ICD.Common/Utils/TryUtils.cs
rename to ICD.Common.Utils/Utils/TryUtils.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlAttribute.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlAttribute.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlAttribute.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlAttribute.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlConvert.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlConvert.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlConvert.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlConvert.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlDocument.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlDocument.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlDocument.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlDocument.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlException.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlException.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlException.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlException.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlReader.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlReader.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlReader.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlReader.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.SimplSharp.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlTextWriter.Standard.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.Standard.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlTextWriter.Standard.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.Standard.cs
diff --git a/ICD.Common/Utils/Xml/IcdXmlTextWriter.cs b/ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/IcdXmlTextWriter.cs
rename to ICD.Common.Utils/Utils/Xml/IcdXmlTextWriter.cs
diff --git a/ICD.Common/Utils/Xml/XmlReaderExtensions.cs b/ICD.Common.Utils/Utils/Xml/XmlReaderExtensions.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/XmlReaderExtensions.cs
rename to ICD.Common.Utils/Utils/Xml/XmlReaderExtensions.cs
diff --git a/ICD.Common/Utils/Xml/XmlUtils.cs b/ICD.Common.Utils/Utils/Xml/XmlUtils.cs
similarity index 100%
rename from ICD.Common/Utils/Xml/XmlUtils.cs
rename to ICD.Common.Utils/Utils/Xml/XmlUtils.cs