Updating to reflect new folder structure.