renamed classes to be without 'model' endings