Rename package. Add constructor.