Updating paths to reflect new directory structure