Refactor courses etc
Refactor Lien