CourseResourceCollection is added and other refactoring