Added subfolder support