Now paths can contain subfolders