model classes moved to model folder