[OES-354] -  Add subfolder setup