Changed package layout