diff --git a/src/ByteSync.ServerCommon/Business/Announcements/Announcement.cs b/src/ByteSync.Common/Business/Announcements/Announcement.cs
similarity index 69%
rename from src/ByteSync.ServerCommon/Business/Announcements/Announcement.cs
rename to src/ByteSync.Common/Business/Announcements/Announcement.cs
index 092e2cc5e..5b42f401f 100644
--- a/src/ByteSync.ServerCommon/Business/Announcements/Announcement.cs
+++ b/src/ByteSync.Common/Business/Announcements/Announcement.cs
@@ -1,4 +1,7 @@
-namespace ByteSync.ServerCommon.Business.Announcements;
+using System;
+using System.Collections.Generic;
+
+namespace ByteSync.Common.Business.Announcements;
 
 public class Announcement
 {
diff --git a/src/ByteSync.Functions/Timer/RefreshAnnouncementsFunction.cs b/src/ByteSync.Functions/Timer/RefreshAnnouncementsFunction.cs
index f2c805ca5..149a6775f 100644
--- a/src/ByteSync.Functions/Timer/RefreshAnnouncementsFunction.cs
+++ b/src/ByteSync.Functions/Timer/RefreshAnnouncementsFunction.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Interfaces.Loaders;
 using ByteSync.ServerCommon.Interfaces.Repositories;
 using Microsoft.Azure.Functions.Worker;
diff --git a/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsCommandHandler.cs b/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsCommandHandler.cs
index 2a72e2fe6..4366c45a4 100644
--- a/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsCommandHandler.cs
+++ b/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsCommandHandler.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Interfaces.Repositories;
 using MediatR;
 
diff --git a/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsRequest.cs b/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsRequest.cs
index cd2ca83cc..52435b6a3 100644
--- a/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsRequest.cs
+++ b/src/ByteSync.ServerCommon/Commands/Announcements/GetActiveAnnouncementsRequest.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using MediatR;
 
 namespace ByteSync.ServerCommon.Commands.Announcements;
diff --git a/src/ByteSync.ServerCommon/Interfaces/Loaders/IAnnouncementsLoader.cs b/src/ByteSync.ServerCommon/Interfaces/Loaders/IAnnouncementsLoader.cs
index 15437fdf2..a33e9e526 100644
--- a/src/ByteSync.ServerCommon/Interfaces/Loaders/IAnnouncementsLoader.cs
+++ b/src/ByteSync.ServerCommon/Interfaces/Loaders/IAnnouncementsLoader.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 
 namespace ByteSync.ServerCommon.Interfaces.Loaders;
 
diff --git a/src/ByteSync.ServerCommon/Interfaces/Repositories/IAnnouncementRepository.cs b/src/ByteSync.ServerCommon/Interfaces/Repositories/IAnnouncementRepository.cs
index 1cb302894..3a4d63c85 100644
--- a/src/ByteSync.ServerCommon/Interfaces/Repositories/IAnnouncementRepository.cs
+++ b/src/ByteSync.ServerCommon/Interfaces/Repositories/IAnnouncementRepository.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 
 namespace ByteSync.ServerCommon.Interfaces.Repositories;
 
diff --git a/src/ByteSync.ServerCommon/Loaders/AnnouncementsLoader.cs b/src/ByteSync.ServerCommon/Loaders/AnnouncementsLoader.cs
index dfd91ff3e..fecfc8b96 100644
--- a/src/ByteSync.ServerCommon/Loaders/AnnouncementsLoader.cs
+++ b/src/ByteSync.ServerCommon/Loaders/AnnouncementsLoader.cs
@@ -1,5 +1,5 @@
 using ByteSync.Common.Controls.Json;
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Business.Settings;
 using ByteSync.ServerCommon.Interfaces.Loaders;
 using Microsoft.Extensions.Logging;
diff --git a/src/ByteSync.ServerCommon/Repositories/AnnouncementRepository.cs b/src/ByteSync.ServerCommon/Repositories/AnnouncementRepository.cs
index f5ade5619..f9e669193 100644
--- a/src/ByteSync.ServerCommon/Repositories/AnnouncementRepository.cs
+++ b/src/ByteSync.ServerCommon/Repositories/AnnouncementRepository.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Entities;
 using ByteSync.ServerCommon.Interfaces.Repositories;
 using ByteSync.ServerCommon.Interfaces.Services;
diff --git a/tests/ByteSync.Functions.UnitTests/Timer/RefreshAnnouncementsFunctionTests.cs b/tests/ByteSync.Functions.UnitTests/Timer/RefreshAnnouncementsFunctionTests.cs
index 0eb133f4b..d11bfdec9 100644
--- a/tests/ByteSync.Functions.UnitTests/Timer/RefreshAnnouncementsFunctionTests.cs
+++ b/tests/ByteSync.Functions.UnitTests/Timer/RefreshAnnouncementsFunctionTests.cs
@@ -1,5 +1,5 @@
 using ByteSync.Functions.Timer;
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Interfaces.Loaders;
 using ByteSync.ServerCommon.Interfaces.Repositories;
 using Microsoft.Azure.Functions.Worker;
diff --git a/tests/ByteSync.ServerCommon.Tests/Commands/Announcements/GetActiveAnnouncementsCommandHandlerTests.cs b/tests/ByteSync.ServerCommon.Tests/Commands/Announcements/GetActiveAnnouncementsCommandHandlerTests.cs
index 225286c67..7a997fcce 100644
--- a/tests/ByteSync.ServerCommon.Tests/Commands/Announcements/GetActiveAnnouncementsCommandHandlerTests.cs
+++ b/tests/ByteSync.ServerCommon.Tests/Commands/Announcements/GetActiveAnnouncementsCommandHandlerTests.cs
@@ -1,4 +1,4 @@
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Commands.Announcements;
 using ByteSync.ServerCommon.Interfaces.Repositories;
 using FakeItEasy;
diff --git a/tests/ByteSync.ServerCommon.Tests/Loaders/AnnouncementsLoaderTests.cs b/tests/ByteSync.ServerCommon.Tests/Loaders/AnnouncementsLoaderTests.cs
index 98e1f5756..5d8b490a8 100644
--- a/tests/ByteSync.ServerCommon.Tests/Loaders/AnnouncementsLoaderTests.cs
+++ b/tests/ByteSync.ServerCommon.Tests/Loaders/AnnouncementsLoaderTests.cs
@@ -1,5 +1,5 @@
 using ByteSync.Common.Controls.Json;
-using ByteSync.ServerCommon.Business.Announcements;
+using ByteSync.Common.Business.Announcements;
 using ByteSync.ServerCommon.Business.Settings;
 using ByteSync.ServerCommon.Loaders;
 using FakeItEasy;