Move some functions out of spells1.c
Rename spells files