Break out component/factory to separate module