(refactor) separate factories
Merge pull request #24 from Neco-Murphy/refactor/factories

(refactor) separate factories