classes moved from model to classes folder