Moved coursework into package