Added folder display functionality, refactored controllers:
Added amazing functionality for displaying folders first