updated with new folder structure