extracted method sortFolders from Controller and put into service class
for cleaner design
deleted access modifier private where necessary and made further
modifications for making changes work.
Merge branch 'DDBNEXT-1212-BAG' into develop