removed Factory class and factory package