Updated package layout