Moved model classes to own folder