Some changes in names and project structure