Rename package so it has same structure as settings and model