Add support for recursive gci and grouping by directory