diff --git a/src/Umbraco.Core/Events/ContentCacheEventArgs.cs b/src/Umbraco.Core/Events/ContentCacheEventArgs.cs
new file mode 100644
index 0000000000..d9b627309e
--- /dev/null
+++ b/src/Umbraco.Core/Events/ContentCacheEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+	public class ContentCacheEventArgs : System.ComponentModel.CancelEventArgs { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/CopyEventArgs.cs b/src/Umbraco.Core/Events/CopyEventArgs.cs
new file mode 100644
index 0000000000..4717e206cd
--- /dev/null
+++ b/src/Umbraco.Core/Events/CopyEventArgs.cs
@@ -0,0 +1,10 @@
+namespace Umbraco.Core.Events
+{
+	public class CopyEventArgs : System.ComponentModel.CancelEventArgs
+	{
+		/// <summary>
+		/// Gets or Sets the Id of the objects new parent.
+		/// </summary>
+		public int ParentId { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/DeleteEventArgs.cs b/src/Umbraco.Core/Events/DeleteEventArgs.cs
new file mode 100644
index 0000000000..a799e39956
--- /dev/null
+++ b/src/Umbraco.Core/Events/DeleteEventArgs.cs
@@ -0,0 +1,10 @@
+namespace Umbraco.Core.Events
+{
+	public class DeleteEventArgs : System.ComponentModel.CancelEventArgs
+	{
+		/// <summary>
+		/// Gets or Sets the Id of the object being deleted.
+		/// </summary>
+		public int Id { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/EventArgs.cs b/src/Umbraco.Core/Events/EventArgs.cs
deleted file mode 100644
index 53606be796..0000000000
--- a/src/Umbraco.Core/Events/EventArgs.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Umbraco.Core.Events
-{
-
-	//Publishing Events
-    public class PublishingEventArgs : System.ComponentModel.CancelEventArgs 
-	{
-	    public PublishingEventArgs()
-	    {
-		    IsAllRepublished = false;
-	    }
-
-	    public PublishingEventArgs(bool isAllPublished)
-	    {
-		    IsAllRepublished = isAllPublished;
-	    }
-
-        public bool IsAllRepublished { get; private set; }
-    }
-
-    public class SendToPublishEventArgs : System.ComponentModel.CancelEventArgs { }
-
-    //Moving object Events
-    public class MoveEventArgs : System.ComponentModel.CancelEventArgs
-    {
-        /// <summary>
-        /// Gets or Sets the Id of the objects new parent.
-        /// </summary>
-        public int ParentId { get; set; }
-    }
-
-    //Copying object Events
-    public class CopyEventArgs : System.ComponentModel.CancelEventArgs
-    {
-        /// <summary>
-        /// Gets or Sets the Id of the objects new parent.
-        /// </summary>
-        public int ParentId { get; set; }
-    }
-    
-    //Rollback Content Event
-    public class RollbackEventArgs : System.ComponentModel.CancelEventArgs { }
-
-    //Content Cache Event args
-    public class ContentCacheEventArgs : System.ComponentModel.CancelEventArgs { }
-    public class RefreshContentEventArgs : System.ComponentModel.CancelEventArgs { }
-
-    //Generel eventArgs
-    public class DeleteEventArgs : System.ComponentModel.CancelEventArgs
-    {
-        /// <summary>
-        /// Gets or Sets the Id of the object being deleted.
-        /// </summary>
-        public int Id { get; set; }
-    }
-	public class SaveEventArgs : System.ComponentModel.CancelEventArgs { }
-    public class NewEventArgs : System.ComponentModel.CancelEventArgs
-    {
-        /// <summary>
-        /// Gets or Sets the Alias.
-        /// </summary>
-        public string Alias { get; set; }
-
-        /// <summary>
-        /// Gets or Sets the Id of the parent.
-        /// </summary>
-        public int ParentId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/MoveEventArgs.cs b/src/Umbraco.Core/Events/MoveEventArgs.cs
new file mode 100644
index 0000000000..6226cde7d4
--- /dev/null
+++ b/src/Umbraco.Core/Events/MoveEventArgs.cs
@@ -0,0 +1,10 @@
+namespace Umbraco.Core.Events
+{
+	public class MoveEventArgs : System.ComponentModel.CancelEventArgs
+	{
+		/// <summary>
+		/// Gets or Sets the Id of the objects new parent.
+		/// </summary>
+		public int ParentId { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/NewEventArgs.cs b/src/Umbraco.Core/Events/NewEventArgs.cs
new file mode 100644
index 0000000000..d74cb24b5c
--- /dev/null
+++ b/src/Umbraco.Core/Events/NewEventArgs.cs
@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Events
+{
+	public class NewEventArgs : System.ComponentModel.CancelEventArgs
+	{
+		/// <summary>
+		/// Gets or Sets the Alias.
+		/// </summary>
+		public string Alias { get; set; }
+
+		/// <summary>
+		/// Gets or Sets the Id of the parent.
+		/// </summary>
+		public int ParentId { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/PublishingEventArgs.cs b/src/Umbraco.Core/Events/PublishingEventArgs.cs
new file mode 100644
index 0000000000..f762695f70
--- /dev/null
+++ b/src/Umbraco.Core/Events/PublishingEventArgs.cs
@@ -0,0 +1,17 @@
+namespace Umbraco.Core.Events
+{
+	public class PublishingEventArgs : System.ComponentModel.CancelEventArgs 
+	{
+	    public PublishingEventArgs()
+	    {
+		    IsAllRepublished = false;
+	    }
+
+	    public PublishingEventArgs(bool isAllPublished)
+	    {
+		    IsAllRepublished = isAllPublished;
+	    }
+
+        public bool IsAllRepublished { get; private set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/RefreshContentEventArgs.cs b/src/Umbraco.Core/Events/RefreshContentEventArgs.cs
new file mode 100644
index 0000000000..3afac7eca1
--- /dev/null
+++ b/src/Umbraco.Core/Events/RefreshContentEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+	public class RefreshContentEventArgs : System.ComponentModel.CancelEventArgs { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/RollbackEventArgs.cs b/src/Umbraco.Core/Events/RollbackEventArgs.cs
new file mode 100644
index 0000000000..58baa334b7
--- /dev/null
+++ b/src/Umbraco.Core/Events/RollbackEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+	public class RollbackEventArgs : System.ComponentModel.CancelEventArgs { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/SaveEventArgs.cs b/src/Umbraco.Core/Events/SaveEventArgs.cs
new file mode 100644
index 0000000000..c3654586dd
--- /dev/null
+++ b/src/Umbraco.Core/Events/SaveEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+	public class SaveEventArgs : System.ComponentModel.CancelEventArgs { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Events/SendToPublishEventArgs.cs b/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
new file mode 100644
index 0000000000..1c2a868e61
--- /dev/null
+++ b/src/Umbraco.Core/Events/SendToPublishEventArgs.cs
@@ -0,0 +1,4 @@
+namespace Umbraco.Core.Events
+{
+	public class SendToPublishEventArgs : System.ComponentModel.CancelEventArgs { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 464321202f..f46668a936 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -117,7 +117,16 @@
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
     <Compile Include="Dynamics\DynamicInstanceHelper.cs" />
-    <Compile Include="Events\EventArgs.cs" />
+    <Compile Include="Events\ContentCacheEventArgs.cs" />
+    <Compile Include="Events\CopyEventArgs.cs" />
+    <Compile Include="Events\DeleteEventArgs.cs" />
+    <Compile Include="Events\PublishingEventArgs.cs" />
+    <Compile Include="Events\MoveEventArgs.cs" />
+    <Compile Include="Events\NewEventArgs.cs" />
+    <Compile Include="Events\RefreshContentEventArgs.cs" />
+    <Compile Include="Events\RollbackEventArgs.cs" />
+    <Compile Include="Events\SaveEventArgs.cs" />
+    <Compile Include="Events\SendToPublishEventArgs.cs" />
     <Compile Include="MacroPropertyTypeResolver.cs" />
     <Compile Include="Models\ContentBase.cs" />
     <Compile Include="Models\ContentExtensions.cs" />