Merge "Allow sub directories for graphs"