Mock

Refactored structure of models