Added folding for comments and Imports statemens. Addition to the #421.