Added factory package with factory class