diff --git a/Source/Messaging/MessageMap.cs b/Source/Messaging/MessageMap.cs
index 01cbcfa..68f3f99 100644
--- a/Source/Messaging/MessageMap.cs
+++ b/Source/Messaging/MessageMap.cs
@@ -1,5 +1,7 @@
 namespace Fossa.Messaging;
 
+using Fossa.Messaging.Messages.Events;
+
 /// <summary>
 /// Provides a mapping between message types and their corresponding integer identifiers for message serialization and
 /// deserialization.
@@ -48,13 +50,13 @@ private static void RegisterMessageType<TKey>(int value, ref BiMap<ComparableTyp
 
     private static void RegisterMessageTypes(ref BiMap<ComparableType, int> messageTypeBiMap)
     {
-        RegisterMessageType<CompanyChanged>(64169988, ref messageTypeBiMap);
-        RegisterMessageType<CompanyDeleted>(64169993, ref messageTypeBiMap);
-        RegisterMessageType<EmployeeChanged>(64171400, ref messageTypeBiMap);
-        RegisterMessageType<EmployeeDeleted>(64171404, ref messageTypeBiMap);
-        RegisterMessageType<BranchChanged>(64171407, ref messageTypeBiMap);
-        RegisterMessageType<BranchDeleted>(64171411, ref messageTypeBiMap);
-        RegisterMessageType<DepartmentChanged>(64171414, ref messageTypeBiMap);
-        RegisterMessageType<DepartmentDeleted>(64171418, ref messageTypeBiMap);
+        RegisterMessageType<CompanyChangedProtoEvent>(64169988, ref messageTypeBiMap);
+        RegisterMessageType<CompanyDeletedProtoEvent>(64169993, ref messageTypeBiMap);
+        RegisterMessageType<EmployeeChangedProtoEvent>(64171400, ref messageTypeBiMap);
+        RegisterMessageType<EmployeeDeletedProtoEvent>(64171404, ref messageTypeBiMap);
+        RegisterMessageType<BranchChangedProtoEvent>(64171407, ref messageTypeBiMap);
+        RegisterMessageType<BranchDeletedProtoEvent>(64171411, ref messageTypeBiMap);
+        RegisterMessageType<DepartmentChangedProtoEvent>(64171414, ref messageTypeBiMap);
+        RegisterMessageType<DepartmentDeletedProtoEvent>(64171418, ref messageTypeBiMap);
     }
 }
diff --git a/Source/Messaging/schema.proto b/Source/Messaging/Messages/Events.proto
similarity index 72%
rename from Source/Messaging/schema.proto
rename to Source/Messaging/Messages/Events.proto
index 6cc829d..f4d6cd1 100644
--- a/Source/Messaging/schema.proto
+++ b/Source/Messaging/Messages/Events.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package Fossa.Messaging;
+package Fossa.Messaging.Messages.Events;
 
-option csharp_namespace = "Fossa.Messaging";
+option csharp_namespace = "Fossa.Messaging.Messages.Events";
 
-message CompanyChanged {
+message CompanyChangedProtoEvent {
   int64  CompanyId    = 1;
   string Name         = 2;
   string CountryCodes = 3;
 }
 
-message CompanyDeleted {
+message CompanyDeletedProtoEvent {
   int64 CompanyId = 1;
 }
 
@@ -23,7 +23,7 @@ message Address {
   string Subdivision = 6;
 }
 
-message BranchChanged {
+message BranchChangedProtoEvent {
   int64   BranchId   = 1;
   int64   CompanyId  = 2;
   string  Name       = 3;
@@ -31,11 +31,11 @@ message BranchChanged {
   string  TimeZoneId = 5;
 }
 
-message BranchDeleted {
+message BranchDeletedProtoEvent {
   int64 BranchId = 1;
 }
 
-message EmployeeChanged {
+message EmployeeChangedProtoEvent {
   int64  EmployeeId           = 1;
   int64  CompanyId            = 2;
   string FirstName            = 3;
@@ -47,11 +47,11 @@ message EmployeeChanged {
   int64  ReportsToId          = 9;
 }
 
-message EmployeeDeleted {
+message EmployeeDeletedProtoEvent {
   int64 EmployeeId = 1;
 }
 
-message DepartmentChanged {
+message DepartmentChangedProtoEvent {
   int64  DepartmentId       = 1;
   int64  CompanyId          = 2;
   string Name               = 3;
@@ -59,6 +59,6 @@ message DepartmentChanged {
   int64  ParentDepartmentId = 5;
 }
 
-message DepartmentDeleted {
+message DepartmentDeletedProtoEvent {
   int64 DepartmentId = 1;
 }
diff --git a/Source/Messaging/Messaging.csproj b/Source/Messaging/Messaging.csproj
index b3f4ec9..1410977 100644
--- a/Source/Messaging/Messaging.csproj
+++ b/Source/Messaging/Messaging.csproj
@@ -21,6 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Protobuf Include="schema.proto" GrpcServices="None" />
+    <Protobuf Include="Messages\Events.proto" GrpcServices="None" />
   </ItemGroup>
 </Project>
diff --git a/Tests/.runsettings b/Tests/.runsettings
index 17b536d..40d67f4 100644
--- a/Tests/.runsettings
+++ b/Tests/.runsettings
@@ -6,9 +6,8 @@
         <Configuration>
           <Format>cobertura</Format>
           <Exclude>
-            [Fossa.Messaging]*Schema*;
-            [Fossa.Messaging]*Changed;
-            [Fossa.Messaging]*Deleted;
+            [Fossa.Messaging.Messages.Events]*Events*;
+            [Fossa.Messaging.Messages.Events]*ProtoEvent*;
             [Fossa.Messaging.Test]*
           </Exclude>
           <ExcludeByAttribute>
@@ -17,7 +16,7 @@
             System.Diagnostics.DebuggerNonUserCodeAttribute
           </ExcludeByAttribute>
           <ExcludeByFile>
-            **/Schema.cs
+            **/Messages/Events.cs
           </ExcludeByFile>
         </Configuration>
       </DataCollector>
diff --git a/Tests/Messaging.Test/MessageMapTests.cs b/Tests/Messaging.Test/MessageMapTests.cs
index 8fb6260..0e51c76 100644
--- a/Tests/Messaging.Test/MessageMapTests.cs
+++ b/Tests/Messaging.Test/MessageMapTests.cs
@@ -1,6 +1,7 @@
 namespace Fossa.Messaging.Test;
 
 using System.Collections.Generic;
+using Fossa.Messaging.Messages.Events;
 
 public class MessageMapTests
 {
@@ -10,7 +11,7 @@ public void GetMessageType_WithRegisteredId_ShouldReturnCorrectType()
     {
         // Arrange
         MessageMap messageMap = new();
-        var expectedType = typeof(CompanyChanged);
+        var expectedType = typeof(CompanyChangedProtoEvent);
         const int messageId = 64169988;
 
         // Act
@@ -36,7 +37,7 @@ public void GetMessageTypeID_WithRegisteredType_ShouldReturnCorrectId()
     {
         // Arrange
         MessageMap messageMap = new();
-        var messageType = typeof(CompanyChanged);
+        var messageType = typeof(CompanyChangedProtoEvent);
         const int expectedId = 64169988;
 
         // Act
@@ -58,14 +59,14 @@ public void GetMessageTypeID_WithUnregisteredType_ShouldThrowKeyNotFoundExceptio
     }
 
     [Theory]
-    [InlineData(typeof(CompanyChanged), 64169988)]
-    [InlineData(typeof(CompanyDeleted), 64169993)]
-    [InlineData(typeof(EmployeeChanged), 64171400)]
-    [InlineData(typeof(EmployeeDeleted), 64171404)]
-    [InlineData(typeof(BranchChanged), 64171407)]
-    [InlineData(typeof(BranchDeleted), 64171411)]
-    [InlineData(typeof(DepartmentChanged), 64171414)]
-    [InlineData(typeof(DepartmentDeleted), 64171418)]
+    [InlineData(typeof(CompanyChangedProtoEvent), 64169988)]
+    [InlineData(typeof(CompanyDeletedProtoEvent), 64169993)]
+    [InlineData(typeof(EmployeeChangedProtoEvent), 64171400)]
+    [InlineData(typeof(EmployeeDeletedProtoEvent), 64171404)]
+    [InlineData(typeof(BranchChangedProtoEvent), 64171407)]
+    [InlineData(typeof(BranchDeletedProtoEvent), 64171411)]
+    [InlineData(typeof(DepartmentChangedProtoEvent), 64171414)]
+    [InlineData(typeof(DepartmentDeletedProtoEvent), 64171418)]
     public void RegisterMessageTypes_ShouldRegisterAllTypes(Type messageType, int expectedId)
     {
         // Arrange