Course Service is added and other refactors