reorganised the projects to add the Core project