folder reordering integrated in my classes
Merge pull request #2143 from ssushma/dev-branch

folder reordering integrated in my classes