Refactoring setup

* Annotated models
* Added finder methods for email