Refactored module structure and updated spells searching.