I um'd and aah'd.  I don't really see the advantage of a separate file for the factory, at least at this point.  It'd be a different story if the factory had heavy includes, but it doesn't.