Refactor the Factory behavior out of the Helper object
Merge pull request #70 from unepwcmc/refactor-factories

Refactor the Factory behavior out of the Helper object