Working towards faster folder retrieval & content retrieval

Signed-off-by: Philip Vanloo <philip.vanloo@kahosl.be>