Switch to better package layout