Herstructurering van classes en Closes #11 , Closes #15