diff --git a/src/Umbraco.Core/Events/CancellableEventArgs.cs b/src/Umbraco.Abstractions/Events/CancellableEventArgs.cs
similarity index 98%
rename from src/Umbraco.Core/Events/CancellableEventArgs.cs
rename to src/Umbraco.Abstractions/Events/CancellableEventArgs.cs
index d9d670ea59..2aa693147d 100644
--- a/src/Umbraco.Core/Events/CancellableEventArgs.cs
+++ b/src/Umbraco.Abstractions/Events/CancellableEventArgs.cs
@@ -96,7 +96,7 @@ namespace Umbraco.Core.Events
         /// This allows for a bit of flexibility in our event raising - it's not pretty but we need to maintain backwards compatibility
         /// so we cannot change the strongly typed nature for some events.
         /// </remarks>
-        public ReadOnlyDictionary<string, object> AdditionalData { get; internal set; }
+        public ReadOnlyDictionary<string, object> AdditionalData { get; set; }
 
         /// <summary>
         /// This can be used by event subscribers to store state in the event args so they easily deal with custom state data between a starting ("ing")
@@ -105,7 +105,7 @@ namespace Umbraco.Core.Events
         public IDictionary<string, object> EventState
         {
             get => _eventState ?? (_eventState = new Dictionary<string, object>());
-            internal set => _eventState = value;
+            set => _eventState = value;
         }
 
         public bool Equals(CancellableEventArgs other)
diff --git a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs b/src/Umbraco.Abstractions/Events/CancellableObjectEventArgs.cs
similarity index 96%
rename from src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
rename to src/Umbraco.Abstractions/Events/CancellableObjectEventArgs.cs
index daf36fd6c8..1d47e9fd95 100644
--- a/src/Umbraco.Core/Events/CancellableObjectEventArgs.cs
+++ b/src/Umbraco.Abstractions/Events/CancellableObjectEventArgs.cs
@@ -41,6 +41,6 @@ namespace Umbraco.Core.Events
         /// <remarks>
         /// This is protected so that inheritors can expose it with their own name
         /// </remarks>
-        internal object EventObject { get; set; }
+        public object EventObject { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Events/ContentCacheEventArgs.cs b/src/Umbraco.Abstractions/Events/ContentCacheEventArgs.cs
similarity index 100%
rename from src/Umbraco.Core/Events/ContentCacheEventArgs.cs
rename to src/Umbraco.Abstractions/Events/ContentCacheEventArgs.cs
diff --git a/src/Umbraco.Abstractions/Events/DatabaseCreationEventArgs.cs b/src/Umbraco.Abstractions/Events/DatabaseCreationEventArgs.cs
new file mode 100644
index 0000000000..514ca68d41
--- /dev/null
+++ b/src/Umbraco.Abstractions/Events/DatabaseCreationEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+    public class DatabaseCreationEventArgs : System.ComponentModel.CancelEventArgs{}
+}
diff --git a/src/Umbraco.Core/Events/EventDefinition.cs b/src/Umbraco.Abstractions/Events/EventDefinition.cs
similarity index 90%
rename from src/Umbraco.Core/Events/EventDefinition.cs
rename to src/Umbraco.Abstractions/Events/EventDefinition.cs
index 17030bad54..e8da5aec3d 100644
--- a/src/Umbraco.Core/Events/EventDefinition.cs
+++ b/src/Umbraco.Abstractions/Events/EventDefinition.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Events
 {
-    internal class EventDefinition : EventDefinitionBase
+    public class EventDefinition : EventDefinitionBase
     {
         private readonly EventHandler _trackedEvent;
         private readonly object _sender;
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Events
         }
     }
 
-    internal class EventDefinition<TEventArgs> : EventDefinitionBase
+    public class EventDefinition<TEventArgs> : EventDefinitionBase
     {
         private readonly EventHandler<TEventArgs> _trackedEvent;
         private readonly object _sender;
@@ -48,7 +48,7 @@ namespace Umbraco.Core.Events
         }
     }
 
-    internal class EventDefinition<TSender, TEventArgs> : EventDefinitionBase
+    public class EventDefinition<TSender, TEventArgs> : EventDefinitionBase
     {
         private readonly TypedEventHandler<TSender, TEventArgs> _trackedEvent;
         private readonly TSender _sender;
diff --git a/src/Umbraco.Core/Events/EventDefinitionBase.cs b/src/Umbraco.Abstractions/Events/EventDefinitionBase.cs
similarity index 100%
rename from src/Umbraco.Core/Events/EventDefinitionBase.cs
rename to src/Umbraco.Abstractions/Events/EventDefinitionBase.cs
diff --git a/src/Umbraco.Core/Events/EventDefinitionFilter.cs b/src/Umbraco.Abstractions/Events/EventDefinitionFilter.cs
similarity index 100%
rename from src/Umbraco.Core/Events/EventDefinitionFilter.cs
rename to src/Umbraco.Abstractions/Events/EventDefinitionFilter.cs
diff --git a/src/Umbraco.Core/Events/EventMessage.cs b/src/Umbraco.Abstractions/Events/EventMessage.cs
similarity index 93%
rename from src/Umbraco.Core/Events/EventMessage.cs
rename to src/Umbraco.Abstractions/Events/EventMessage.cs
index c66753aeca..e3bf0a6f66 100644
--- a/src/Umbraco.Core/Events/EventMessage.cs
+++ b/src/Umbraco.Abstractions/Events/EventMessage.cs
@@ -22,6 +22,6 @@
         /// <summary>
         /// This is used to track if this message should be used as a default message so that Umbraco doesn't also append it's own default messages
         /// </summary>
-        internal bool IsDefaultEventMessage { get; set; }
+        public bool IsDefaultEventMessage { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Events/EventMessageType.cs b/src/Umbraco.Abstractions/Events/EventMessageType.cs
similarity index 100%
rename from src/Umbraco.Core/Events/EventMessageType.cs
rename to src/Umbraco.Abstractions/Events/EventMessageType.cs
diff --git a/src/Umbraco.Core/Events/EventMessages.cs b/src/Umbraco.Abstractions/Events/EventMessages.cs
similarity index 100%
rename from src/Umbraco.Core/Events/EventMessages.cs
rename to src/Umbraco.Abstractions/Events/EventMessages.cs
diff --git a/src/Umbraco.Core/Events/EventNameExtractor.cs b/src/Umbraco.Abstractions/Events/EventNameExtractor.cs
similarity index 96%
rename from src/Umbraco.Core/Events/EventNameExtractor.cs
rename to src/Umbraco.Abstractions/Events/EventNameExtractor.cs
index 627426f2ee..b8274d4c70 100644
--- a/src/Umbraco.Core/Events/EventNameExtractor.cs
+++ b/src/Umbraco.Abstractions/Events/EventNameExtractor.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Events
     ///
     /// We can also write tests to validate these are all working correctly for all services.
     /// </summary>
-    internal class EventNameExtractor
+    public class EventNameExtractor
     {
 
         /// <summary>
@@ -52,7 +52,7 @@ namespace Umbraco.Core.Events
             }
         }
 
-        internal static string[] FindEvents(Type senderType, Type argsType, Func<string, bool> exclude)
+        public static string[] FindEvents(Type senderType, Type argsType, Func<string, bool> exclude)
         {
             var found = MatchedEventNames.GetOrAdd(new Tuple<Type, Type>(senderType, argsType), tuple =>
             {
@@ -120,7 +120,7 @@ namespace Umbraco.Core.Events
         /// </summary>
         /// <param name="eventName"></param>
         /// <returns></returns>
-        internal static bool MatchIngNames(string eventName)
+        public static bool MatchIngNames(string eventName)
         {
             var splitter = new Regex(@"(?<!^)(?=[A-Z])");
             var words = splitter.Split(eventName);
@@ -134,7 +134,7 @@ namespace Umbraco.Core.Events
         /// </summary>
         /// <param name="eventName"></param>
         /// <returns></returns>
-        internal static bool MatchNonIngNames(string eventName)
+        public static bool MatchNonIngNames(string eventName)
         {
             var splitter = new Regex(@"(?<!^)(?=[A-Z])");
             var words = splitter.Split(eventName);
diff --git a/src/Umbraco.Core/Events/EventNameExtractorError.cs b/src/Umbraco.Abstractions/Events/EventNameExtractorError.cs
similarity index 67%
rename from src/Umbraco.Core/Events/EventNameExtractorError.cs
rename to src/Umbraco.Abstractions/Events/EventNameExtractorError.cs
index a4aa47d611..c39029fc72 100644
--- a/src/Umbraco.Core/Events/EventNameExtractorError.cs
+++ b/src/Umbraco.Abstractions/Events/EventNameExtractorError.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Events
 {
-    internal enum EventNameExtractorError
+    public enum EventNameExtractorError
     {
         NoneFound,
         Ambiguous
diff --git a/src/Umbraco.Core/Events/EventNameExtractorResult.cs b/src/Umbraco.Abstractions/Events/EventNameExtractorResult.cs
similarity index 89%
rename from src/Umbraco.Core/Events/EventNameExtractorResult.cs
rename to src/Umbraco.Abstractions/Events/EventNameExtractorResult.cs
index 7c2a295e38..70be9966c0 100644
--- a/src/Umbraco.Core/Events/EventNameExtractorResult.cs
+++ b/src/Umbraco.Abstractions/Events/EventNameExtractorResult.cs
@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Events
 {
-    internal class EventNameExtractorResult
+    public class EventNameExtractorResult
     {
         public EventNameExtractorError? Error { get; private set; }
         public string Name { get; private set; }
diff --git a/src/Umbraco.Core/Events/IDeletingMediaFilesEventArgs.cs b/src/Umbraco.Abstractions/Events/IDeletingMediaFilesEventArgs.cs
similarity index 71%
rename from src/Umbraco.Core/Events/IDeletingMediaFilesEventArgs.cs
rename to src/Umbraco.Abstractions/Events/IDeletingMediaFilesEventArgs.cs
index 19580b4106..b221e9d447 100644
--- a/src/Umbraco.Core/Events/IDeletingMediaFilesEventArgs.cs
+++ b/src/Umbraco.Abstractions/Events/IDeletingMediaFilesEventArgs.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Events
 {
-    internal interface IDeletingMediaFilesEventArgs
+    public interface IDeletingMediaFilesEventArgs
     {
         List<string> MediaFilesToDelete { get; }
     }
diff --git a/src/Umbraco.Core/Events/IEventDefinition.cs b/src/Umbraco.Abstractions/Events/IEventDefinition.cs
similarity index 100%
rename from src/Umbraco.Core/Events/IEventDefinition.cs
rename to src/Umbraco.Abstractions/Events/IEventDefinition.cs
diff --git a/src/Umbraco.Core/Events/IEventDispatcher.cs b/src/Umbraco.Abstractions/Events/IEventDispatcher.cs
similarity index 100%
rename from src/Umbraco.Core/Events/IEventDispatcher.cs
rename to src/Umbraco.Abstractions/Events/IEventDispatcher.cs
diff --git a/src/Umbraco.Core/Events/IEventMessagesAccessor.cs b/src/Umbraco.Abstractions/Events/IEventMessagesAccessor.cs
similarity index 100%
rename from src/Umbraco.Core/Events/IEventMessagesAccessor.cs
rename to src/Umbraco.Abstractions/Events/IEventMessagesAccessor.cs
diff --git a/src/Umbraco.Core/Events/IEventMessagesFactory.cs b/src/Umbraco.Abstractions/Events/IEventMessagesFactory.cs
similarity index 100%
rename from src/Umbraco.Core/Events/IEventMessagesFactory.cs
rename to src/Umbraco.Abstractions/Events/IEventMessagesFactory.cs
diff --git a/src/Umbraco.Core/Events/MacroErrorEventArgs.cs b/src/Umbraco.Abstractions/Events/MacroErrorEventArgs.cs
similarity index 100%
rename from src/Umbraco.Core/Events/MacroErrorEventArgs.cs
rename to src/Umbraco.Abstractions/Events/MacroErrorEventArgs.cs
diff --git a/src/Umbraco.Core/Events/MoveEventInfo.cs b/src/Umbraco.Abstractions/Events/MoveEventInfo.cs
similarity index 100%
rename from src/Umbraco.Core/Events/MoveEventInfo.cs
rename to src/Umbraco.Abstractions/Events/MoveEventInfo.cs
diff --git a/src/Umbraco.Core/Events/PassThroughEventDispatcher.cs b/src/Umbraco.Abstractions/Events/PassThroughEventDispatcher.cs
similarity index 100%
rename from src/Umbraco.Core/Events/PassThroughEventDispatcher.cs
rename to src/Umbraco.Abstractions/Events/PassThroughEventDispatcher.cs
diff --git a/src/Umbraco.Core/Events/RefreshContentEventArgs.cs b/src/Umbraco.Abstractions/Events/RefreshContentEventArgs.cs
similarity index 100%
rename from src/Umbraco.Core/Events/RefreshContentEventArgs.cs
rename to src/Umbraco.Abstractions/Events/RefreshContentEventArgs.cs
diff --git a/src/Umbraco.Core/Events/SendEmailEventArgs.cs b/src/Umbraco.Abstractions/Events/SendEmailEventArgs.cs
similarity index 83%
rename from src/Umbraco.Core/Events/SendEmailEventArgs.cs
rename to src/Umbraco.Abstractions/Events/SendEmailEventArgs.cs
index 7b6cfceaaf..cfe43233cd 100644
--- a/src/Umbraco.Core/Events/SendEmailEventArgs.cs
+++ b/src/Umbraco.Abstractions/Events/SendEmailEventArgs.cs
@@ -3,7 +3,7 @@ using System.Net.Mail;
 
 namespace Umbraco.Core.Events
 {
-    internal class SendEmailEventArgs : EventArgs
+    public class SendEmailEventArgs : EventArgs
     {
         public MailMessage Message { get; private set; }
 
diff --git a/src/Umbraco.Core/Events/SupersedeEventAttribute.cs b/src/Umbraco.Abstractions/Events/SupersedeEventAttribute.cs
similarity index 92%
rename from src/Umbraco.Core/Events/SupersedeEventAttribute.cs
rename to src/Umbraco.Abstractions/Events/SupersedeEventAttribute.cs
index 2488890a73..d7198ea117 100644
--- a/src/Umbraco.Core/Events/SupersedeEventAttribute.cs
+++ b/src/Umbraco.Abstractions/Events/SupersedeEventAttribute.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Events
     /// will mean that the event will not be dispatched or the args will be filtered to exclude the entity.
     /// </summary>
     [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-    internal class SupersedeEventAttribute : Attribute
+    public class SupersedeEventAttribute : Attribute
     {
         public Type SupersededEventArgsType { get; private set; }
 
diff --git a/src/Umbraco.Core/Events/TypedEventHandler.cs b/src/Umbraco.Abstractions/Events/TypedEventHandler.cs
similarity index 100%
rename from src/Umbraco.Core/Events/TypedEventHandler.cs
rename to src/Umbraco.Abstractions/Events/TypedEventHandler.cs
diff --git a/src/Umbraco.Core/Events/UserGroupWithUsers.cs b/src/Umbraco.Abstractions/Events/UserGroupWithUsers.cs
similarity index 92%
rename from src/Umbraco.Core/Events/UserGroupWithUsers.cs
rename to src/Umbraco.Abstractions/Events/UserGroupWithUsers.cs
index b69650d33f..7d456a22ea 100644
--- a/src/Umbraco.Core/Events/UserGroupWithUsers.cs
+++ b/src/Umbraco.Abstractions/Events/UserGroupWithUsers.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models.Membership;
 
 namespace Umbraco.Core.Events
 {
-    internal class UserGroupWithUsers
+    public class UserGroupWithUsers
     {
         public UserGroupWithUsers(IUserGroup userGroup, IUser[] addedUsers, IUser[] removedUsers)
         {
diff --git a/src/Umbraco.Core/Events/DatabaseCreationEventArgs.cs b/src/Umbraco.Core/Events/DatabaseCreationEventArgs.cs
deleted file mode 100644
index 08ddf2d4e6..0000000000
--- a/src/Umbraco.Core/Events/DatabaseCreationEventArgs.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Umbraco.Core.Events
-{
-    internal class DatabaseCreationEventArgs : System.ComponentModel.CancelEventArgs{}
-}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 5d6ca25d90..924dcaa11a 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -193,6 +193,24 @@
     <Compile Include="Constants-System.cs" />
     <Compile Include="Constants-Web.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
+    <Compile Include="Events\ContentPublishedEventArgs.cs" />
+    <Compile Include="Events\ContentPublishingEventArgs.cs" />
+    <Compile Include="Events\ContentSavedEventArgs.cs" />
+    <Compile Include="Events\ContentSavingEventArgs.cs" />
+    <Compile Include="Events\CopyEventArgs.cs" />
+    <Compile Include="Events\DeleteEventArgs.cs" />
+    <Compile Include="Events\DeleteRevisionsEventArgs.cs" />
+    <Compile Include="Events\ExportedMemberEventArgs.cs" />
+    <Compile Include="Events\ImportPackageEventArgs.cs" />
+    <Compile Include="Events\MigrationEventArgs.cs" />
+    <Compile Include="Events\MoveEventArgs.cs" />
+    <Compile Include="Events\NewEventArgs.cs" />
+    <Compile Include="Events\PublishEventArgs.cs" />
+    <Compile Include="Events\QueuingEventDispatcherBase.cs" />
+    <Compile Include="Events\RecycleBinEventArgs.cs" />
+    <Compile Include="Events\RollbackEventArgs.cs" />
+    <Compile Include="Events\SendToPublishEventArgs.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />
@@ -317,15 +335,8 @@
     <Compile Include="RegisterExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
     <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
-    <Compile Include="Events\CancellableEnumerableObjectEventArgs.cs" />
     <Compile Include="Events\CancellableObjectEventArgsOfTEventObject.cs" />
-    <Compile Include="Events\ContentPublishedEventArgs.cs" />
-    <Compile Include="Events\ContentPublishingEventArgs.cs" />
-    <Compile Include="Events\ContentSavedEventArgs.cs" />
-    <Compile Include="Events\ContentSavingEventArgs.cs" />
-    <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
-    <Compile Include="Events\UserGroupWithUsers.cs" />
     <Compile Include="IO\IFileSystems.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="GuidUtils.cs" />
@@ -526,47 +537,10 @@
     <Compile Include="Deploy\IValueConnector.cs" />
     <Compile Include="Diagnostics\MiniDump.cs" />
     <Compile Include="EmailSender.cs" />
-    <Compile Include="Events\CancellableEventArgs.cs" />
-    <Compile Include="Events\CancellableObjectEventArgs.cs" />
-    <Compile Include="Events\ContentCacheEventArgs.cs" />
-    <Compile Include="Events\CopyEventArgs.cs" />
-    <Compile Include="Events\DatabaseCreationEventArgs.cs" />
-    <Compile Include="Events\DeleteEventArgs.cs" />
-    <Compile Include="Events\DeleteRevisionsEventArgs.cs" />
-    <Compile Include="Events\EventDefinition.cs" />
-    <Compile Include="Events\EventDefinitionBase.cs" />
-    <Compile Include="Events\EventDefinitionFilter.cs" />
     <Compile Include="Events\EventExtensions.cs" />
-    <Compile Include="Events\EventMessage.cs" />
-    <Compile Include="Events\EventMessages.cs" />
-    <Compile Include="Events\EventMessageType.cs" />
-    <Compile Include="Events\EventNameExtractor.cs" />
-    <Compile Include="Events\EventNameExtractorError.cs" />
-    <Compile Include="Events\EventNameExtractorResult.cs" />
-    <Compile Include="Events\IDeletingMediaFilesEventArgs.cs" />
-    <Compile Include="Events\IEventDefinition.cs" />
-    <Compile Include="Events\IEventDispatcher.cs" />
-    <Compile Include="Events\IEventMessagesAccessor.cs" />
-    <Compile Include="Events\IEventMessagesFactory.cs" />
-    <Compile Include="Events\ImportPackageEventArgs.cs" />
-    <Compile Include="Events\MacroErrorEventArgs.cs" />
-    <Compile Include="Events\MigrationEventArgs.cs" />
-    <Compile Include="Events\MoveEventArgs.cs" />
-    <Compile Include="Events\MoveEventInfo.cs" />
-    <Compile Include="Events\NewEventArgs.cs" />
-    <Compile Include="Events\PassThroughEventDispatcher.cs" />
-    <Compile Include="Events\PublishEventArgs.cs" />
     <Compile Include="Events\QueuingEventDispatcher.cs" />
-    <Compile Include="Events\QueuingEventDispatcherBase.cs" />
-    <Compile Include="Events\RecycleBinEventArgs.cs" />
-    <Compile Include="Events\RefreshContentEventArgs.cs" />
-    <Compile Include="Events\RollbackEventArgs.cs" />
     <Compile Include="Events\SaveEventArgs.cs" />
-    <Compile Include="Events\SendEmailEventArgs.cs" />
-    <Compile Include="Events\SendToPublishEventArgs.cs" />
-    <Compile Include="Events\SupersedeEventAttribute.cs" />
     <Compile Include="Events\TransientEventMessagesFactory.cs" />
-    <Compile Include="Events\TypedEventHandler.cs" />
     <Compile Include="Events\UninstallPackageEventArgs.cs" />
     <Compile Include="Composing\LightInject\LightInjectException.cs" />
     <Compile Include="ExpressionExtensions.cs" />