diff --git a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
index 78b8ee6..ef2a1ce 100644
--- a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
+++ b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
@@ -120,10 +120,10 @@
     <Compile Include="Extensions\CollectionExtensions.cs" />
     <Compile Include="Extensions\RegistryExtensions.cs" />
     <Compile Include="Extensions\VersionExtensions.cs" />
-    <Compile Include="AbstractIcdResetEvent.cs" />
-    <Compile Include="IcdAutoResetEvent.cs" />
+    <Compile Include="Threading\AbstractIcdResetEvent.cs" />
+    <Compile Include="Threading\IcdAutoResetEvent.cs" />
     <Compile Include="IcdManualResetEvent.cs" />
-    <Compile Include="ThreadedWorkerQueue.cs" />
+    <Compile Include="Threading\ThreadedWorkerQueue.cs" />
     <Compile Include="TimeZoneInfo\IcdTimeZoneInfo.cs" />
     <Compile Include="ObfuscationSettings.cs" />
     <Compile Include="Extensions\BoolExtensions.cs" />
@@ -216,10 +216,10 @@
     <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="Threading\SafeCriticalSection.cs" />
+    <Compile Include="Threading\SafeCriticalSection.SimplSharp.cs" />
+    <Compile Include="Threading\SafeCriticalSection.Standard.cs" />
+    <Compile Include="Threading\SafeMutex.cs" />
     <Compile Include="SPlusUtils.cs" />
     <Compile Include="Sqlite\eDbType.cs" />
     <Compile Include="Sqlite\IcdDbDataReader.cs" />
@@ -232,7 +232,7 @@
     <Compile Include="Sqlite\IIcdDataRecord.cs" />
     <Compile Include="StringUtils.cs" />
     <Compile Include="TableBuilder.cs" />
-    <Compile Include="ThreadingUtils.cs" />
+    <Compile Include="Threading\ThreadingUtils.cs" />
     <Compile Include="Timers\IcdStopwatch.cs" />
     <Compile Include="Timers\IcdTimer.cs" />
     <Compile Include="Timers\Repeater.cs" />
diff --git a/ICD.Common.Utils/AbstractIcdResetEvent.cs b/ICD.Common.Utils/Threading/AbstractIcdResetEvent.cs
similarity index 100%
rename from ICD.Common.Utils/AbstractIcdResetEvent.cs
rename to ICD.Common.Utils/Threading/AbstractIcdResetEvent.cs
diff --git a/ICD.Common.Utils/IcdAutoResetEvent.cs b/ICD.Common.Utils/Threading/IcdAutoResetEvent.cs
similarity index 100%
rename from ICD.Common.Utils/IcdAutoResetEvent.cs
rename to ICD.Common.Utils/Threading/IcdAutoResetEvent.cs
diff --git a/ICD.Common.Utils/SafeCriticalSection.SimplSharp.cs b/ICD.Common.Utils/Threading/SafeCriticalSection.SimplSharp.cs
similarity index 100%
rename from ICD.Common.Utils/SafeCriticalSection.SimplSharp.cs
rename to ICD.Common.Utils/Threading/SafeCriticalSection.SimplSharp.cs
diff --git a/ICD.Common.Utils/SafeCriticalSection.Standard.cs b/ICD.Common.Utils/Threading/SafeCriticalSection.Standard.cs
similarity index 100%
rename from ICD.Common.Utils/SafeCriticalSection.Standard.cs
rename to ICD.Common.Utils/Threading/SafeCriticalSection.Standard.cs
diff --git a/ICD.Common.Utils/SafeCriticalSection.cs b/ICD.Common.Utils/Threading/SafeCriticalSection.cs
similarity index 100%
rename from ICD.Common.Utils/SafeCriticalSection.cs
rename to ICD.Common.Utils/Threading/SafeCriticalSection.cs
diff --git a/ICD.Common.Utils/SafeMutex.cs b/ICD.Common.Utils/Threading/SafeMutex.cs
similarity index 100%
rename from ICD.Common.Utils/SafeMutex.cs
rename to ICD.Common.Utils/Threading/SafeMutex.cs
diff --git a/ICD.Common.Utils/ThreadedWorkerQueue.cs b/ICD.Common.Utils/Threading/ThreadedWorkerQueue.cs
similarity index 100%
rename from ICD.Common.Utils/ThreadedWorkerQueue.cs
rename to ICD.Common.Utils/Threading/ThreadedWorkerQueue.cs
diff --git a/ICD.Common.Utils/ThreadingUtils.cs b/ICD.Common.Utils/Threading/ThreadingUtils.cs
similarity index 100%
rename from ICD.Common.Utils/ThreadingUtils.cs
rename to ICD.Common.Utils/Threading/ThreadingUtils.cs