Add Preamble fold support

Add Preamble fold support
Merge branch 'BetterCodeFolding'