refactor factory
Merge pull request #16 from ginalupu/create-event,-data-retriever-and-genre-models

refactor factory