Moved Factory to /main/