Updated to latest folder structure
Updated to latest folder structure