restructure models (one class - one file)