Move spellthis out of bundle/
Improve folding settings