Moving some classes to a model folder