Refactoring to new spells package