Updated to reflect new folder structure