Merge pull request #2135 from ssushma/dev-branch

Merges from release 6.6.a1
"Added the removed code while merging"
Merge pull request #2138 from suryanarayanakb/dev-branch

"Added the removed code while merging"
"Added ids and comments"
Merge pull request #2141 from suryanarayanakb/dev-branch

"Added ids and comments"
folder reordering integrated in my classes