Added initial Org-Course modelling