Major updates to yml files and folder structure for project