Move factory object to top-level package