Added groups, added courses controllers