Added Subfolder detection for non Root installation