Adding Folders-Files Sort Mode

Patch Set 2: Whitespace... derp

Change-Id: Ieecad6ebb3f8db96547f30593496dba6a6bc75cb