updated package layout