Rename package; refactor setup