diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 92e3172f14..daad6f287b 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -46,4 +46,7 @@
     <EmbeddedResource Include="Localization\Ratings\*.txt" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="ScheduledTasks\Triggers\" />
+  </ItemGroup>
 </Project>
diff --git a/Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
rename to Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
rename to Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
rename to Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
rename to Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/DailyTrigger.cs
rename to Emby.Server.Implementations/ScheduledTasks/Triggers/DailyTrigger.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/IntervalTrigger.cs
rename to Emby.Server.Implementations/ScheduledTasks/Triggers/IntervalTrigger.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/StartupTrigger.cs
rename to Emby.Server.Implementations/ScheduledTasks/Triggers/StartupTrigger.cs
diff --git a/Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs b/Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs
similarity index 100%
rename from Emby.Server.Implementations/ScheduledTasks/WeeklyTrigger.cs
rename to Emby.Server.Implementations/ScheduledTasks/Triggers/WeeklyTrigger.cs