Removed services and changed project naming