Fixed subfolder parsing