clean up
moved spell casting factory under generators
relates #49