refactor and reorganize for making sonar happy
Merge branch 'master' of https://github.com/HogeschoolLeiden/website