Updating paths to match new folder structure