Simplified listing folder

Also updated the way info is presented to API caller.