First pass at updated package layout.