diff --git a/TrueCraft.Core/Logic/Items/DiamondSwordItem.cs b/TrueCraft.Core/Logic/Items/DiamondSwordItem.cs
deleted file mode 100644
index 08f2f95..0000000
--- a/TrueCraft.Core/Logic/Items/DiamondSwordItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class DiamondSwordItem : SwordItem
-    {
-        public static readonly short ItemID = 0x114;
-
-        public override short ID { get { return 0x114; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
-
-        public override short BaseDurability { get { return 1562; } }
-
-        public override float Damage { get { return 5.5f; } }
-
-        public override string DisplayName { get { return "Diamond Sword"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/GoldenSwordItem.cs b/TrueCraft.Core/Logic/Items/GoldenSwordItem.cs
deleted file mode 100644
index ec40854..0000000
--- a/TrueCraft.Core/Logic/Items/GoldenSwordItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class GoldenSwordItem : SwordItem
-    {
-        public static readonly short ItemID = 0x11B;
-
-        public override short ID { get { return 0x11B; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
-
-        public override short BaseDurability { get { return 33; } }
-
-        public override float Damage { get { return 2.5f; } }
-
-        public override string DisplayName { get { return "Golden Sword"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/IronSwordItem.cs b/TrueCraft.Core/Logic/Items/IronSwordItem.cs
deleted file mode 100644
index 3356b5d..0000000
--- a/TrueCraft.Core/Logic/Items/IronSwordItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class IronSwordItem : SwordItem
-    {
-        public static readonly short ItemID = 0x10B;
-
-        public override short ID { get { return 0x10B; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
-
-        public override short BaseDurability { get { return 251; } }
-
-        public override float Damage { get { return 4.5f; } }
-
-        public override string DisplayName { get { return "Iron Sword"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/StoneSwordItem.cs b/TrueCraft.Core/Logic/Items/StoneSwordItem.cs
deleted file mode 100644
index 56e68de..0000000
--- a/TrueCraft.Core/Logic/Items/StoneSwordItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class StoneSwordItem : SwordItem
-    {
-        public static readonly short ItemID = 0x110;
-
-        public override short ID { get { return 0x110; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
-
-        public override short BaseDurability { get { return 132; } }
-
-        public override float Damage { get { return 3.5f; } }
-
-        public override string DisplayName { get { return "Stone Sword"; } }
-    }
-}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/SwordItem.cs b/TrueCraft.Core/Logic/Items/SwordItem.cs
new file mode 100644
index 0000000..0a8658e
--- /dev/null
+++ b/TrueCraft.Core/Logic/Items/SwordItem.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrueCraft.API;
+
+namespace TrueCraft.Core.Logic.Items
+{
+    public abstract class SwordItem : ToolItem
+    {
+        public abstract float Damage { get; }
+    }
+
+    public class WoodenSwordItem : SwordItem
+    {
+        public static readonly short ItemID = 0x10C;
+
+        public override short ID { get { return 0x10C; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
+
+        public override short BaseDurability { get { return 60; } }
+
+        public override float Damage { get { return 2.5f; } }
+
+        public override string DisplayName { get { return "Wooden Sword"; } }
+    }
+
+    public class StoneSwordItem : SwordItem
+    {
+        public static readonly short ItemID = 0x110;
+
+        public override short ID { get { return 0x110; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Stone; } }
+
+        public override short BaseDurability { get { return 132; } }
+
+        public override float Damage { get { return 3.5f; } }
+
+        public override string DisplayName { get { return "Stone Sword"; } }
+    }
+
+    public class IronSwordItem : SwordItem
+    {
+        public static readonly short ItemID = 0x10B;
+
+        public override short ID { get { return 0x10B; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Iron; } }
+
+        public override short BaseDurability { get { return 251; } }
+
+        public override float Damage { get { return 4.5f; } }
+
+        public override string DisplayName { get { return "Iron Sword"; } }
+    }
+
+    public class GoldenSwordItem : SwordItem
+    {
+        public static readonly short ItemID = 0x11B;
+
+        public override short ID { get { return 0x11B; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Gold; } }
+
+        public override short BaseDurability { get { return 33; } }
+
+        public override float Damage { get { return 2.5f; } }
+
+        public override string DisplayName { get { return "Golden Sword"; } }
+    }
+
+    public class DiamondSwordItem : SwordItem
+    {
+        public static readonly short ItemID = 0x114;
+
+        public override short ID { get { return 0x114; } }
+
+        public override ToolMaterial Material { get { return ToolMaterial.Diamond; } }
+
+        public override short BaseDurability { get { return 1562; } }
+
+        public override float Damage { get { return 5.5f; } }
+
+        public override string DisplayName { get { return "Diamond Sword"; } }
+    }
+}
\ No newline at end of file
diff --git a/TrueCraft.Core/Logic/Items/ToolItem.cs b/TrueCraft.Core/Logic/Items/ToolItem.cs
index 18ce907..0b2a5a4 100644
--- a/TrueCraft.Core/Logic/Items/ToolItem.cs
+++ b/TrueCraft.Core/Logic/Items/ToolItem.cs
@@ -33,9 +33,4 @@ namespace TrueCraft.Core.Logic
     public abstract class ShovelItem : ToolItem
     {
     }
-
-    public abstract class SwordItem : ToolItem
-    {
-        public abstract float Damage { get; }
-    }
 }
diff --git a/TrueCraft.Core/Logic/Items/WoodenSwordItem.cs b/TrueCraft.Core/Logic/Items/WoodenSwordItem.cs
deleted file mode 100644
index 22d8ab0..0000000
--- a/TrueCraft.Core/Logic/Items/WoodenSwordItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using TrueCraft.API.Logic;
-using TrueCraft.API;
-
-namespace TrueCraft.Core.Logic.Items
-{
-    public class WoodenSwordItem : SwordItem
-    {
-        public static readonly short ItemID = 0x10C;
-
-        public override short ID { get { return 0x10C; } }
-
-        public override ToolMaterial Material { get { return ToolMaterial.Wood; } }
-
-        public override short BaseDurability { get { return 60; } }
-
-        public override float Damage { get { return 2.5f; } }
-
-        public override string DisplayName { get { return "Wooden Sword"; } }
-    }
-}
\ No newline at end of file