Improve Course structure

:sake: