Some changes to the projects and solution