diff --git a/EndlessClient/HUD/Panels/Old/OldActiveSpellsPanel.cs b/EndlessClient/HUD/Panels/Old/OldActiveSpellsPanel.cs
index 7b6603f0a..da035d8cc 100644
--- a/EndlessClient/HUD/Panels/Old/OldActiveSpellsPanel.cs
+++ b/EndlessClient/HUD/Panels/Old/OldActiveSpellsPanel.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using EndlessClient.Dialogs;
-using EndlessClient.HUD.Spells;
+using EndlessClient.HUD.Spells.Old;
 using EndlessClient.Old;
 using EndlessClient.UIControls;
 using EOLib;
diff --git a/EndlessClient/HUD/Spells/EmptySpellIcon.cs b/EndlessClient/HUD/Spells/Old/EmptySpellIcon.cs
similarity index 95%
rename from EndlessClient/HUD/Spells/EmptySpellIcon.cs
rename to EndlessClient/HUD/Spells/Old/EmptySpellIcon.cs
index 568df0134..7cf450ff3 100644
--- a/EndlessClient/HUD/Spells/EmptySpellIcon.cs
+++ b/EndlessClient/HUD/Spells/Old/EmptySpellIcon.cs
@@ -8,7 +8,7 @@
 using Microsoft.Xna.Framework.Input;
 using XNAControls.Old;
 
-namespace EndlessClient.HUD.Spells
+namespace EndlessClient.HUD.Spells.Old
 {
     public class EmptySpellIcon : XNAControl, ISpellIcon
     {
@@ -32,7 +32,7 @@ public virtual bool Selected
             {
                 if (value)
                 {
-                    ((EOGame) Game).Hud.SetStatusLabel(EOResourceID.STATUS_LABEL_TYPE_WARNING, EOResourceID.SPELL_NOTHING_WAS_SELECTED);
+                    ((EOGame)Game).Hud.SetStatusLabel(EOResourceID.STATUS_LABEL_TYPE_WARNING, EOResourceID.SPELL_NOTHING_WAS_SELECTED);
                 }
             }
         }
diff --git a/EndlessClient/HUD/Spells/ISpellIcon.cs b/EndlessClient/HUD/Spells/Old/ISpellIcon.cs
similarity index 91%
rename from EndlessClient/HUD/Spells/ISpellIcon.cs
rename to EndlessClient/HUD/Spells/Old/ISpellIcon.cs
index 2af8ffbe2..2d4f96d81 100644
--- a/EndlessClient/HUD/Spells/ISpellIcon.cs
+++ b/EndlessClient/HUD/Spells/Old/ISpellIcon.cs
@@ -1,6 +1,6 @@
 using EOLib.IO.Pub;
 
-namespace EndlessClient.HUD.Spells
+namespace EndlessClient.HUD.Spells.Old
 {
     public interface ISpellIcon
     {
diff --git a/EndlessClient/HUD/Spells/SpellIcon.cs b/EndlessClient/HUD/Spells/Old/SpellIcon.cs
similarity index 94%
rename from EndlessClient/HUD/Spells/SpellIcon.cs
rename to EndlessClient/HUD/Spells/Old/SpellIcon.cs
index 168d63372..bad3eb494 100644
--- a/EndlessClient/HUD/Spells/SpellIcon.cs
+++ b/EndlessClient/HUD/Spells/Old/SpellIcon.cs
@@ -9,7 +9,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 
-namespace EndlessClient.HUD.Spells
+namespace EndlessClient.HUD.Spells.Old
 {
     public class SpellIcon : EmptySpellIcon
     {
@@ -61,7 +61,7 @@ public SpellIcon(OldActiveSpells parent, ESFRecord data, int slot)
             _spellGraphicSourceRect = new Rectangle(0, 0, _spellGraphic.Width / 2, _spellGraphic.Height);
 
             _spellLevelColor = new Texture2D(Game.GraphicsDevice, 1, 1);
-            _spellLevelColor.SetData(new[] {Color.FromNonPremultiplied(0xc9, 0xb8, 0x9b, 0xff)});
+            _spellLevelColor.SetData(new[] { Color.FromNonPremultiplied(0xc9, 0xb8, 0x9b, 0xff) });
             OnLevelChanged();
 
             _clickTime = DateTime.Now;
@@ -99,14 +99,14 @@ protected override void OnSlotChanged()
 
         private void OnSelected()
         {
-            var hud = ((EOGame) Game).Hud;
+            var hud = ((EOGame)Game).Hud;
             switch (SpellData.Target)
             {
                 case SpellTarget.Normal:
                     hud.SetStatusLabel(EOResourceID.SKILLMASTER_WORD_SPELL, SpellData.Name, EOResourceID.SPELL_WAS_SELECTED);
                     break;
                 case SpellTarget.Group:
-                    if(!hud.MainPlayerIsInParty())
+                    if (!hud.MainPlayerIsInParty())
                         hud.SetStatusLabel(EOResourceID.STATUS_LABEL_TYPE_WARNING, EOResourceID.SPELL_ONLY_WORKS_ON_GROUP);
                     break;
             }
@@ -126,13 +126,13 @@ private void UpdateIconSourceRect()
             {
                 SetIconHover(MouseOver);
                 if (MouseOver && !_parentSpellContainer.AnySpellsDragging())
-                    ((EOGame) Game).Hud.SetStatusLabel(EOResourceID.SKILLMASTER_WORD_SPELL, SpellData.Name);
+                    ((EOGame)Game).Hud.SetStatusLabel(EOResourceID.SKILLMASTER_WORD_SPELL, SpellData.Name);
             }
         }
 
         private void SetIconHover(bool hover)
         {
-            var halfWidth = _spellGraphic.Width/2;
+            var halfWidth = _spellGraphic.Width / 2;
             _spellGraphicSourceRect = new Rectangle(hover ? halfWidth : 0, 0, halfWidth, _spellGraphic.Height);
         }
 
@@ -226,7 +226,7 @@ private void DrawSpellIcon()
                 alphaColor = Color.FromNonPremultiplied(255, 255, 255, 128);
             }
 
-            if (targetDrawArea.Width*targetDrawArea.Height == 0)
+            if (targetDrawArea.Width * targetDrawArea.Height == 0)
                 return;
 
             SpriteBatch.Draw(_spellGraphic, targetDrawArea, _spellGraphicSourceRect, alphaColor);