Adds folding options to allow folding by block

LGTM
-Quentin