I'm partially in favor of the guild and partially in favor of magic in the skills!
I think we can put regular magic into the guild (let's say levels 1-3, if we count using the 1-5 scale from Heroes), and put the skills that enhance the effects of these magics + mass effects and + powerful spells (levels 4-5) into the skills.
Auto-translated
